From de8ac77ef9441128d1939f29515f81ee3480c496 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sun, 29 Sep 2019 15:40:26 -0400 Subject: [PATCH] debian/rules: Use /usr/share/dpkg/{architecture,buildflags}.mk. Delegate dpkg-{architecture,buildflags} calls to /usr/share/dpkg/{architecture,buildflags}.mk respectively. --- debian/changelog | 4 +++- debian/rules | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96338cea..9c0df93d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ncbi-blast+ (2.9.0-2) UNRELEASED; urgency=medium * NOT RELEASED YET. + * debian/rules: Delegate dpkg-{architecture,buildflags} calls to + /usr/share/dpkg/{architecture,buildflags}.mk respectively. - -- Aaron M. Ucko Sun, 29 Sep 2019 15:37:26 -0400 + -- Aaron M. Ucko Sun, 29 Sep 2019 15:40:25 -0400 ncbi-blast+ (2.9.0-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 00976d24..95cbb751 100755 --- a/debian/rules +++ b/debian/rules @@ -26,12 +26,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie export DEB_CFLAGS_MAINT_APPEND=-Wall -pedantic export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +include /usr/share/dpkg/architecture.mk +include /usr/share/dpkg/buildflags.mk -CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed +LDFLAGS += -Wl,--as-needed ifneq (,$(findstring mips,$(DEB_HOST_ARCH))) CXXFLAGS := $(CXXFLAGS:-O%=-O) -- 2.30.2