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.

diff --git a/debian/changelog b/debian/changelog
index 0eef87b64c6413ae92e0e13f9f61342b09779b66..55e88128041d948abdad0f0bed7576672b6305fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,14 @@ ncbi-blast+ (2.2.25-4) UNRELEASED; urgency=low
     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@debian.org>  Sun, 28 Aug 2011 18:29:39 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 28 Aug 2011 18:33:01 -0400
 
 ncbi-blast+ (2.2.25-3) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 91d3841b91554ce294d91c6d49458f7aef4ac791..fe7e5d72c0c69d1f1f294964be1097ea795c1e42 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ override_dh_auto_configure:
            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