From b36970cbf45ea8ff321e77b05e44dbea7dba0ef3 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Fri, 11 May 2012 03:40:45 +0000 Subject: [PATCH] ncbi-blast+: Use upstream's new --with-symbols flag in nostrip builds. --- debian/changelog | 3 ++- debian/rules | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0ab1db0..6505f969 100644 --- 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 Thu, 10 May 2012 23:29:17 -0400 + -- Aaron M. Ucko 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 4292f6a2..a2ad16a2 100755 --- 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 -- 2.30.2