debian/rules: Half clean up -Wl,-as-needed.

Stop directly injecting -Wl,--as-needed into LDFLAGS, but keep
DEB_LDFLAGS_MAINT_APPEND for the sake of backports, along with a
comment that they can't rely on GCC 9+.

diff --git a/debian/changelog b/debian/changelog
index 55840d447e3ed5934f5f6b5b8456f043417feb75..a4037c4ff865264a37593e1d63da104e6d6263ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,11 @@ ncbi-blast+ (2.10.0-1) UNRELEASED; urgency=medium
       c++/include/common/ncbi_revision.h.
     - override_dh_install-arch: Install new cleanup-blastdb-volumes script
       without its upstream .py suffix.
+    - Stop directly injecting -Wl,--as-needed into LDFLAGS, but keep
+      DEB_LDFLAGS_MAINT_APPEND for the sake of backports, along with a
+      comment that they can't rely on GCC 9+.
 
- -- Aaron M. Ucko <ucko@debian.org>  Sun, 26 Apr 2020 18:02:47 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 26 Apr 2020 18:05:25 -0400
 
 ncbi-blast+ (2.9.0-4) unstable; urgency=high
 

diff --git a/debian/rules b/debian/rules
index 9d6976f00aa430b70f1c8bc29f158abc008e497c..ef8b0e7f4068b0e6a2e4f77ae444b6dd8d7c541c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,13 +26,12 @@ DEB_CONFIGURE_EXTRA_FLAGS += --with-symbols
 #export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEB_CFLAGS_MAINT_APPEND=-Wall -pedantic
+# Kept for the sake of backports, which can't rely on GCC 9+.
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/buildflags.mk
 
-LDFLAGS += -Wl,--as-needed
-
 ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
 CXXFLAGS := $(CXXFLAGS:-O%=-O)
 DEB_CONFIGURE_EXTRA_FLAGS += FAST_CXXFLAGS=-O