debian/patches/no_multiarch_rpath: new; avoid redundant rpath entries

on multiarch systems (courtesy of overzealous logic to ensure
executables will be able to find libstdc++.)

diff --git a/debian/changelog b/debian/changelog
index 55e88128041d948abdad0f0bed7576672b6305fd..337c960f754bf5dcc89a293e962e8d25ae9a74c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,11 +15,14 @@ ncbi-blast+ (2.2.25-4) UNRELEASED; urgency=low
   * debian/rules: tweak LDFLAGS, supplying -Wl,--as-needed across the
     board (as it is now safe to do so) and adding -Wl,--enable-new-dtags
     to allow LD_LIBRARY_PATH to override the private rpath.
+  * debian/patches/no_multiarch_rpath: new; avoid redundant rpath entries
+    on multiarch systems (courtesy of overzealous logic to ensure
+    executables will be able to find libstdc++.)
 
   [ Andreas Tille ]
   * Enhances: t-coffee (as stated in tasks file)
 
- -- Aaron M. Ucko <ucko@debian.org>  Sun, 28 Aug 2011 18:33:01 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 28 Aug 2011 18:42:07 -0400
 
 ncbi-blast+ (2.2.25-3) unstable; urgency=low
 

diff --git a/debian/patches/no_multiarch_rpath b/debian/patches/no_multiarch_rpath
new file mode 100644 (file)
index 0000000..52ddd62
--- /dev/null
+++ b/debian/patches/no_multiarch_rpath
@@ -0,0 +1,36 @@
+Subject: 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
+Index: b/c++/src/build-system/configure
+===================================================================
+--- a/c++/src/build-system/configure   2011-08-28 11:41:27.000000000 -0400
++++ b/c++/src/build-system/configure   2011-08-28 11:48:06.000000000 -0400
+@@ -5613,7 +5613,7 @@
+                break
+                ;;
+             /* )
+-               found=true
++               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
+                break
+                ;;
+         esac
+Index: b/c++/src/build-system/configure.ac
+===================================================================
+--- a/c++/src/build-system/configure.ac        2011-08-28 11:41:27.000000000 -0400
++++ b/c++/src/build-system/configure.ac        2011-08-28 11:48:11.000000000 -0400
+@@ -1494,7 +1494,7 @@
+                break
+                ;;
+             /* )
+-               found=true
++               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
+                break
+                ;;
+         esac

diff --git a/debian/patches/series b/debian/patches/series
index b0158468c459de61d7e53841553732f99c86b575..51dcf9df03db8575fc51d16baae589576d128a52 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_checks
 fix_gcc46_errors
 support_other_cpus
 fix_lib_deps
+no_multiarch_rpath