From 4b70286ab13a6c4c08efb62983f907d3fa9b1462 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 May 2015 12:04:19 -0600 Subject: [PATCH] Add '/usr/local/lib64' to 'ld.so.conf' since gcc installs there --- 4.7/Dockerfile | 4 ++++ 4.8/Dockerfile | 4 ++++ 4.9/Dockerfile | 4 ++++ 5.1/Dockerfile | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/4.7/Dockerfile b/4.7/Dockerfile index aad43f95db3..60954c8bfbc 100644 --- a/4.7/Dockerfile +++ b/4.7/Dockerfile @@ -43,6 +43,10 @@ RUN buildDeps='flex' \ && rm -rf "$dir" \ && apt-get purge -y --auto-remove $buildDeps +# gcc installs .so files in /usr/local/lib64... +RUN echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf \ + && ldconfig -v + # ensure that alternatives are pointing to the new compiler and that old one is no longer used RUN set -x \ && dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc \ diff --git a/4.8/Dockerfile b/4.8/Dockerfile index 4fbdb3be0d1..a391a003a8d 100644 --- a/4.8/Dockerfile +++ b/4.8/Dockerfile @@ -43,6 +43,10 @@ RUN buildDeps='flex' \ && rm -rf "$dir" \ && apt-get purge -y --auto-remove $buildDeps +# gcc installs .so files in /usr/local/lib64... +RUN echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf \ + && ldconfig -v + # ensure that alternatives are pointing to the new compiler and that old one is no longer used RUN set -x \ && dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc \ diff --git a/4.9/Dockerfile b/4.9/Dockerfile index 9e7c6cb595a..b54bfc70427 100644 --- a/4.9/Dockerfile +++ b/4.9/Dockerfile @@ -43,6 +43,10 @@ RUN buildDeps='flex' \ && rm -rf "$dir" \ && apt-get purge -y --auto-remove $buildDeps +# gcc installs .so files in /usr/local/lib64... +RUN echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf \ + && ldconfig -v + # ensure that alternatives are pointing to the new compiler and that old one is no longer used RUN set -x \ && dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc \ diff --git a/5.1/Dockerfile b/5.1/Dockerfile index 0072799a577..e64689595b1 100644 --- a/5.1/Dockerfile +++ b/5.1/Dockerfile @@ -43,6 +43,10 @@ RUN buildDeps='flex' \ && rm -rf "$dir" \ && apt-get purge -y --auto-remove $buildDeps +# gcc installs .so files in /usr/local/lib64... +RUN echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf \ + && ldconfig -v + # ensure that alternatives are pointing to the new compiler and that old one is no longer used RUN set -x \ && dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc \