From: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
Date: Tue, 5 Sep 2023 02:40:42 +0000 (-0400)
Subject: avoid redundant rpath entries on multiarch systems
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2^2^2^2^2^2^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61e14292f3e2a21d6c6a652031367d162ea8ef82;p=ncbi-blast%2B.git

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 50a90620..fb2ad1bc 100755
--- 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 370a82ec..c4346bf3 100644
--- 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