From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Tue, 2 Jun 2020 22:05:12 +0000 (+0200)
Subject: Change to install libedit-devel instead of symlinking
X-Git-Tag: 2.44.1~18^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d07ff5af4f7cd713e982fe73249482129ed534a3;p=graphviz

Change to install libedit-devel instead of symlinking

Thanks @ellson
---

diff --git a/ci/centos6/Dockerfile b/ci/centos6/Dockerfile
index 1ae04be77..a54bb7e0a 100644
--- a/ci/centos6/Dockerfile
+++ b/ci/centos6/Dockerfile
@@ -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
diff --git a/ci/centos7/Dockerfile b/ci/centos7/Dockerfile
index f3a8ef370..2b193c78c 100644
--- a/ci/centos7/Dockerfile
+++ b/ci/centos7/Dockerfile
@@ -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
diff --git a/ci/centos8/Dockerfile b/ci/centos8/Dockerfile
index 734e75458..cbc8c2a58 100644
--- a/ci/centos8/Dockerfile
+++ b/ci/centos8/Dockerfile
@@ -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
diff --git a/ci/fedora29/Dockerfile b/ci/fedora29/Dockerfile
index 83ef934a9..d7720edd8 100644
--- a/ci/fedora29/Dockerfile
+++ b/ci/fedora29/Dockerfile
@@ -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
diff --git a/ci/fedora30/Dockerfile b/ci/fedora30/Dockerfile
index 64827aff7..47efd90f3 100644
--- a/ci/fedora30/Dockerfile
+++ b/ci/fedora30/Dockerfile
@@ -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
diff --git a/ci/fedora31/Dockerfile b/ci/fedora31/Dockerfile
index d228c5238..6710faf9d 100644
--- a/ci/fedora31/Dockerfile
+++ b/ci/fedora31/Dockerfile
@@ -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
diff --git a/ci/fedora32/Dockerfile b/ci/fedora32/Dockerfile
index bda77c5c0..06ca41459 100644
--- a/ci/fedora32/Dockerfile
+++ b/ci/fedora32/Dockerfile
@@ -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
diff --git a/ci/fedora33/Dockerfile b/ci/fedora33/Dockerfile
index 2656f3db2..d57232b82 100644
--- a/ci/fedora33/Dockerfile
+++ b/ci/fedora33/Dockerfile
@@ -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