ncbi-blast+: Use upstream's new --with-symbols flag in nostrip builds.

diff --git a/debian/changelog b/debian/changelog
index f0ab1db011d6c65fa4825de146c88e29f652feaf..6505f9697e3a87ebfc009a805f078a68bdcab898 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,11 +13,12 @@ ncbi-blast+ (2.2.26-3) UNRELEASED; urgency=low
   * Enable full hardening flags, introducing a small patch
     (use_pie_for_apps) to reflect the need to build executables and
     libraries differently.
+  * Use upstream's new --with-symbols flag in nostrip builds.
   
   [ Andreas Tille ]
   * debian/control: Modernize Vcs-* fields.
 
- -- Aaron M. Ucko <ucko@debian.org>  Thu, 10 May 2012 23:29:17 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 10 May 2012 23:40:39 -0400
 
 ncbi-blast+ (2.2.26-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 4292f6a2ae285595fc0d5122d108c562b8be3f14..a2ad16a2e4e308473cc6cded70e6a7510346d05c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,11 @@
 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 --without-debug
 proj=algo/blast/ app/ objmgr/ objtools/align_format/ objtools/blast/
 
-# XXX - not quite right, as we get -DNDEBUG vs. -D_DEBUG
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-DEB_CONFIGURE_EXTRA_FLAGS += --without-debug
-else
-DEB_CONFIGURE_EXTRA_FLAGS += --with-optimization
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+DEB_CONFIGURE_EXTRA_FLAGS += --with-symbols
 endif
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie