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 50a906203ded9bb1bfec3464481ba628c827ad83..fb2ad1bce2e0bb4f23eb3a37093121a2c70c3cd3 100755 (executable)
--- a/c++/src/build-system/configure
+++ b/c++/src/build-system/configure
@@ -10570,7 +10570,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 370a82ec8062e598d6030e4b6e8f328bdb7b9b52..c4346bf366696b53fcc4bb036a60f53a3ed38377 100644 (file)
--- a/c++/src/build-system/configure.ac
+++ b/c++/src/build-system/configure.ac
@@ -2324,7 +2324,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