[med-svn] r7568 - in trunk/packages/ncbi-blast+/trunk/debian: . patches

[Aaron M. Ucko]

Author: ucko
Date: 2011-08-28 22:42:11 +0000 (Sun, 28 Aug 2011)
New Revision: 7568

Added:
   trunk/packages/ncbi-blast+/trunk/debian/patches/no_multiarch_rpath
Modified:
   trunk/packages/ncbi-blast+/trunk/debian/changelog
   trunk/packages/ncbi-blast+/trunk/debian/patches/series
Log:
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++.)


Modified: trunk/packages/ncbi-blast+/trunk/debian/changelog
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-08-28 22:33:05 UTC (rev 7567)
+++ trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-08-28 22:42:11 UTC (rev 7568)
@@ -15,11 +15,14 @@
   * 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 at debian.org>  Sun, 28 Aug 2011 18:33:01 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Sun, 28 Aug 2011 18:42:07 -0400
 
 ncbi-blast+ (2.2.25-3) unstable; urgency=low
 

Added: trunk/packages/ncbi-blast+/trunk/debian/patches/no_multiarch_rpath
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/patches/no_multiarch_rpath	                        (rev 0)
+++ trunk/packages/ncbi-blast+/trunk/debian/patches/no_multiarch_rpath	2011-08-28 22:42:11 UTC (rev 7568)
@@ -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 at 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

Modified: trunk/packages/ncbi-blast+/trunk/debian/patches/series
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/patches/series	2011-08-28 22:33:05 UTC (rev 7567)
+++ trunk/packages/ncbi-blast+/trunk/debian/patches/series	2011-08-28 22:42:11 UTC (rev 7568)
@@ -4,3 +4,4 @@
 fix_gcc46_errors
 support_other_cpus
 fix_lib_deps
+no_multiarch_rpath