debian/changelog | 4 ++++
debian/rules | 13 ++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 301db48f25d750455c855ee165545f8185f4df98
Author: Moritz Muehlenhoff <j...@debian.org>
Date: Wed Jan 11 20:58:31 2012 +0100
Enable hardened build flags
diff --git a/debian/changelog b/debian/changelog
index aaf9c51..bc611a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* xset 1.2.2
+ add build-dep on x11proto-core-dev 7.0.17
* Drop --disable-xprint from configure flags, it's not used anywhere.
+ [ Moritz Muehlenhoff ]
+ * Enable hardened build flags (closes: #655503)
+
-- Julien Cristau <jcris...@debian.org> Sun, 31 Jul 2011 14:31:05 +0200
x11-xserver-utils (7.6+3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 6061351..214662e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,12 +18,11 @@ DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap
xrandr xrdb xrefresh
SUBDIRS=$(DEF_SUBDIRS)
BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -49,7 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts
$(STAMP_DIR)/patch
cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)" \
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
LDFLAGS="$(LDFLAGS)" \
RSH=rsh \
MANCONF="/etc/manpath.config"
cd $*-build && $(MAKE)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rl4jy-0000gj...@vasks.debian.org
