diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | debian/rules | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 64cd6031..736329f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ mdadm (3.3.2-1) UNRELEASED; urgency=low "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 + * remove separate CFLAGS for udeb and simplify *FLAGS handling -- Michael Tokarev <mjt@tls.msk.ru> Sat, 20 Sep 2014 08:49:59 +0400 diff --git a/debian/rules b/debian/rules index 63e41b21..a495b915 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) CXFLAGS = $(shell dpkg-buildflags --get CFLAGS) \ $(shell dpkg-buildflags --get CPPFLAGS) -CXFLAGS_UDEB := $(CXFLAGS) -fomit-frame-pointer +BUILDFLAGS = CXFLAGS="$(CXFLAGS)" LDFLAGS="$(LDFLAGS)" .PHONY: configure configure: @@ -22,18 +22,16 @@ build-stamp: $(MAKE) -f debian/rules mdadm DEBIAN=yes touch $@ -mdadm.udeb: FLAGS = CXFLAGS="$(CXFLAGS_UDEB)" LDFLAGS="$(LDFLAGS)" CONFFILE=/tmp/mdadm.conf mdadm.udeb: configure dh_testdir - $(MAKE) $(FLAGS) all + $(MAKE) mdadm mdmon $(BUILDFLAGS) CONFFILE=/tmp/mdadm.conf mv mdadm mdadm.udeb mv mdmon mdmon.udeb .PHONY: mdadm.udeb mdmon.udeb -mdadm: FLAGS = CXFLAGS="$(CXFLAGS)" LDFLAGS="$(LDFLAGS)" CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf mdadm: configure dh_testdir - $(MAKE) $(FLAGS) all + $(MAKE) all $(BUILDFLAGS) CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf .PHONY: mdadm INTERPOLATED_FILES = debian/bugscript debian/mkconf |