From: Aaron M. Ucko Date: Sun, 26 Apr 2020 22:05:26 +0000 (-0400) Subject: debian/rules: Half clean up -Wl,-as-needed. X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~109 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=501c028cc969c59b664e3ee50f960ec76bad0ddf;p=ncbi-blast%2B.git 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 55840d44..a4037c4f 100644 --- 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 Sun, 26 Apr 2020 18:02:47 -0400 + -- Aaron M. Ucko 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 9d6976f0..ef8b0e7f 100755 --- 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