debian/changelog | 9 ++++++++- debian/rules | 17 +++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-)
New commits: commit c675cbc3fb5f8a20849d01363b017852fefb6478 Author: Julien Cristau <[email protected]> Date: Wed Dec 28 23:12:15 2011 +0100 Import 1:1.0.8-7 upload diff --git a/debian/changelog b/debian/changelog index 21f1938..d99354f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfs (1:1.0.8-7) unstable; urgency=low + + * QA upload + * Enable hardened build flags through dpkg-buildflags + + -- Moritz Muehlenhoff <[email protected]> Wed, 28 Dec 2011 19:59:54 +0100 + xfs (1:1.0.8-6) unstable; urgency=low * QA upload. diff --git a/debian/rules b/debian/rules index edc47a8..e5f6fd0 100755 --- a/debian/rules +++ b/debian/rules @@ -12,18 +12,18 @@ PACKAGE = xfs include debian/xsfbs/xsfbs.mk -CFLAGS = -Wall -g -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +CFLAGS = `dpkg-buildflags --get CFLAGS` + ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -CPPFLAGS = -DUSE_SYSLOG +CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` +CPPFLAGS += -DUSE_SYSLOG + +LDFLAGS = `dpkg-buildflags --get LDFLAGS` + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -45,7 +45,8 @@ build-stamp: $(STAMP_DIR)/patch $(STAMP_DIR)/genscripts --infodir=\$${prefix}/share/info \ --sysconfdir=/etc $(confflags) \ CFLAGS="$(CFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" + CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) touch build-stamp -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
