From 61e14292f3e2a21d6c6a652031367d162ea8ef82 Mon Sep 17 00:00:00 2001 From: Debian Med Packaging Team Date: Mon, 4 Sep 2023 22:40:42 -0400 Subject: [PATCH] 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 Last-Update: 2011-08-28 Gbp-Pq: Name no_multiarch_rpath --- c++/src/build-system/configure | 2 +- c++/src/build-system/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.30.2