avoid redundant rpath entries on multiarch systems

 * src/build-system/configure(.ac): when ensuring that executables
   will be able to find libstdc++, don't add rpath entries that files
   under /etc/ld.so.conf.d already specify, even if they don't resemble
   traditional single-architecture or biarch locations.

Debian-Bug: 633567.
Author: Aaron M. Ucko <ucko@debian.org>
Last-Update: 2011-08-28

Gbp-Pq: Name no_multiarch_rpath

diff --git a/c++/src/build-system/configure b/c++/src/build-system/configure
index a2f3f4a2ba879a3e330069729e6bb9b5f0fa1feb..9110946974f5b3f48e16629f2a53f6859211aef2 100755 (executable)
--- a/c++/src/build-system/configure
+++ b/c++/src/build-system/configure
@@ -10912,7 +10912,7 @@ case "$compiler:$compiler_version:$with_bin_release:$ncbi_cv_prog_cxx_stdlib_lib
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac

diff --git a/c++/src/build-system/configure.ac b/c++/src/build-system/configure.ac
index 9906d512d35654fcedb9576587ebdf51a4451ea9..5a9a1c014541cd863643c6113c29acdb505b4d29 100644 (file)
--- a/c++/src/build-system/configure.ac
+++ b/c++/src/build-system/configure.ac
@@ -2491,7 +2491,7 @@ case "$compiler:$compiler_version:$with_bin_release:$ncbi_cv_prog_cxx_stdlib_lib
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac