From 27f02cb3d99daa6a0043c327cf633b5ae6e2e1e0 Mon Sep 17 00:00:00 2001 From: Debian Med Packaging Team Date: Sat, 27 Jul 2024 22:38:52 -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 a2f3f4a2..91109469 100755 --- 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 9906d512..5a9a1c01 100644 --- 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 -- 2.30.2