[med-svn] r7567 - trunk/packages/ncbi-blast+/trunk/debian

[Aaron M. Ucko]

Author: ucko
Date: 2011-08-28 22:33:05 +0000 (Sun, 28 Aug 2011)
New Revision: 7567

Modified:
   trunk/packages/ncbi-blast+/trunk/debian/changelog
   trunk/packages/ncbi-blast+/trunk/debian/rules
Log:
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.


Modified: trunk/packages/ncbi-blast+/trunk/debian/changelog
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-08-28 22:29:43 UTC (rev 7566)
+++ trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-08-28 22:33:05 UTC (rev 7567)
@@ -12,11 +12,14 @@
     all direct dependencies.  (Break the dependency loop between libxblast
     and libxalgoblastdbindex by having the former provide only the C++ BLAST
     API, leaving the C core only in libblast.)  (Closes: #633567.)
+  * 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.
 
   [ Andreas Tille ]
   * Enhances: t-coffee (as stated in tasks file)
 
- -- Aaron M. Ucko <ucko at debian.org>  Sun, 28 Aug 2011 18:29:39 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Sun, 28 Aug 2011 18:33:01 -0400
 
 ncbi-blast+ (2.2.25-3) unstable; urgency=low
 

Modified: trunk/packages/ncbi-blast+/trunk/debian/rules
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/rules	2011-08-28 22:29:43 UTC (rev 7566)
+++ trunk/packages/ncbi-blast+/trunk/debian/rules	2011-08-28 22:33:05 UTC (rev 7567)
@@ -7,7 +7,7 @@
 DEB_CONFIGURE_EXTRA_FLAGS=--with-dll --with-mt --without-autodep \
     --without-makefile-auto-update --with-flat-makefile --without-caution \
     --without-dbapi --without-lzo --with-runpath=/usr/lib/ncbi-blast+ \
-    --with-build-root=BUILD
+    --with-build-root=BUILD LDFLAGS='-Wl,--as-needed -Wl,--enable-new-dtags'
 proj=algo/blast/ app/ objmgr/ objtools/align_format/ objtools/blast/
 
 # XXX - not quite right, as we get -DNDEBUG vs. -D_DEBUG
@@ -30,8 +30,7 @@
 	    CONFIG_SHELL=/bin/bash ./configure $(DEB_CONFIGURE_EXTRA_FLAGS)
 
 override_dh_auto_build:
-	cd c++/BUILD/build  &&  make -f Makefile.flat \
-	    all_projects="$(proj)" DLL_LDFLAGS=-Wl,--as-needed
+	cd c++/BUILD/build  &&  make -f Makefile.flat all_projects="$(proj)"
 
 override_dh_auto_test:
 	-dh_auto_test