]> granicus.if.org Git - graphviz/commitdiff
Change to install libedit-devel instead of symlinking
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Tue, 2 Jun 2020 22:05:12 +0000 (00:05 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Thu, 4 Jun 2020 06:24:26 +0000 (08:24 +0200)
Thanks @ellson

ci/centos6/Dockerfile
ci/centos7/Dockerfile
ci/centos8/Dockerfile
ci/fedora29/Dockerfile
ci/fedora30/Dockerfile
ci/fedora31/Dockerfile
ci/fedora32/Dockerfile
ci/fedora33/Dockerfile

index 1ae04be77b5cb26aa97a854372fdea6e7026d87d..a54bb7e0a40c5265e8ae23bb12670636a4035af7 100644 (file)
@@ -2,11 +2,11 @@ FROM centos:6
 
 # Development tools
 RUN yum -y groupinstall 'Development Tools'
-RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so
 
 # Centos build utilities
 RUN yum -y install \
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option xpat
index f3a8ef370358eb7ddb7fc33110b37610464c22c4..2b193c78ce50d8ddb13ff72f4fdb0efb855cff1a 100644 (file)
@@ -2,11 +2,11 @@ FROM centos:7
 
 # Development tools
 RUN yum -y groupinstall 'Development Tools'
-RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so
 
 # Centos build utilities
 RUN yum -y install \
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option glut
index 734e7545818b417983b2613745acb0b86bd36577..cbc8c2a58cb800afe167caa7b430c565ffe3ca86 100644 (file)
@@ -2,12 +2,12 @@ FROM centos:8
 
 # Development tools
 RUN yum -y groupinstall 'Development Tools'
-RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so
 RUN dnf config-manager --set-enabled PowerTools
 
 # Centos build utilities
 RUN yum -y install \
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option glut
index 83ef934a94cd796cb4c5fd1f42c83520a2786815..d7720edd8725218e5b6ac0b83ab6cb0d9ec8265f 100644 (file)
@@ -2,13 +2,13 @@ FROM fedora:29
 
 # Development tools
 RUN yum -y groupinstall 'Development Tools' \
-&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \
 && yum -y install rpm-build \
 bison \
 byacc \
 flex \
 # Centos build utilities
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option glut
index 64827aff7d9d461f59f8e3ca3b77e91ac7f9520e..47efd90f3dcc8436893b7aeb245ed0668701dc80 100644 (file)
@@ -1,13 +1,13 @@
 FROM fedora:30
 # Development tools
 RUN yum -y groupinstall 'Development Tools' \
-&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \
 && yum -y install rpm-build \
 bison \
 byacc \
 flex \
 # Centos build utilities
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option glut
index d228c5238a1398b5281910ded7e627ed5c993c1b..6710faf9da141df195aa3f834859a0e23f030247 100644 (file)
@@ -2,13 +2,13 @@ FROM fedora:31
 
 # Development tools
 RUN yum -y groupinstall 'Development Tools' \
-&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \
 && yum -y install rpm-build \
 bison \
 byacc \
 flex \
 # Centos build utilities
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option glut
index bda77c5c022db1329d1760863c361c3aebd3c932..06ca41459a63856bf7350f0cc18e946f9b48a2fc 100644 (file)
@@ -1,13 +1,13 @@
 FROM fedora:32
 # Development tools
 RUN yum -y groupinstall 'Development Tools' \
-&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \
 && yum -y install rpm-build \
 bison \
 byacc \
 flex \
 # Centos build utilities
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option glut
index 2656f3db28cb12b5c52263527812d2afc52b18d5..d57232b822a3932d05f301673bb1000bba7c8b18 100644 (file)
@@ -2,13 +2,13 @@ FROM fedora:33
 
 # Development tools
 RUN yum -y groupinstall 'Development Tools' \
-&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \
 && yum -y install rpm-build \
 bison \
 byacc \
 flex \
 # Centos build utilities
 libtool-ltdl-devel \
+libedit-devel \
 ksh \
 cmake \
 # Option xpat