From 8658125c55f403e1c320df45aa78ed384b9aac55 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Sat, 27 Sep 2014 20:10:28 +0400 Subject: pass dpkg-buildflags to upstream build system --- debian/changelog | 2 ++ debian/rules | 15 +++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7debaeb4..64cd6031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ mdadm (3.3.2-1) UNRELEASED; urgency=low and these days, better alternatives exist online * removed debian-specific mdadm-startall script which does nothing more than "mdadm --assemble --scan". Remove docbook-to-man from build-deps. + * pass dpkg-buildflags to upstream build system and + stop using our own -O0, -Os etc -- Michael Tokarev Sat, 20 Sep 2014 08:49:59 +0400 diff --git a/debian/rules b/debian/rules index 2bc6ff72..63e41b21 100755 --- a/debian/rules +++ b/debian/rules @@ -6,15 +6,10 @@ #export DH_VERBOSE=1 -CXFLAGS = -ggdb +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +CXFLAGS = $(shell dpkg-buildflags --get CFLAGS) \ + $(shell dpkg-buildflags --get CPPFLAGS) CXFLAGS_UDEB := $(CXFLAGS) -fomit-frame-pointer -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CXFLAGS += -O0 - CXFLAGS_UDEB += -O0 -else - CXFLAGS += -O2 - CXFLAGS_UDEB += -Os -endif .PHONY: configure configure: @@ -27,7 +22,7 @@ build-stamp: $(MAKE) -f debian/rules mdadm DEBIAN=yes touch $@ -mdadm.udeb: FLAGS = CXFLAGS="$(CXFLAGS_UDEB)" CONFFILE=/tmp/mdadm.conf +mdadm.udeb: FLAGS = CXFLAGS="$(CXFLAGS_UDEB)" LDFLAGS="$(LDFLAGS)" CONFFILE=/tmp/mdadm.conf mdadm.udeb: configure dh_testdir $(MAKE) $(FLAGS) all @@ -35,7 +30,7 @@ mdadm.udeb: configure mv mdmon mdmon.udeb .PHONY: mdadm.udeb mdmon.udeb -mdadm: FLAGS = CXFLAGS="$(CXFLAGS)" CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf +mdadm: FLAGS = CXFLAGS="$(CXFLAGS)" LDFLAGS="$(LDFLAGS)" CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf mdadm: configure dh_testdir $(MAKE) $(FLAGS) all -- cgit v1.2.3