jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable hardened build flags

This commit is contained in:
Moritz Muehlenhoff 2012-01-11 20:58:31 +01:00 committed by Julien Cristau
parent e6b6d2b33d
commit 301db48f25
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,9 +1,13 @@
x11-xserver-utils (7.6+4) UNRELEASED; urgency=low x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
[ Julien Cristau ]
* xset 1.2.2 * xset 1.2.2
+ add build-dep on x11proto-core-dev 7.0.17 + add build-dep on x11proto-core-dev 7.0.17
* Drop --disable-xprint from configure flags, it's not used anywhere. * Drop --disable-xprint from configure flags, it's not used anywhere.
[ Moritz Muehlenhoff ]
* Enable hardened build flags (closes: #655503)
-- Julien Cristau <jcristau@debian.org> Sun, 31 Jul 2011 14:31:05 +0200 -- Julien Cristau <jcristau@debian.org> Sun, 31 Jul 2011 14:31:05 +0200
x11-xserver-utils (7.6+3) unstable; urgency=low x11-xserver-utils (7.6+3) unstable; urgency=low

13
debian/rules vendored
View File

@ -18,12 +18,11 @@ DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb xrefresh
SUBDIRS=$(DEF_SUBDIRS) SUBDIRS=$(DEF_SUBDIRS)
BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
CFLAGS = -Wall -g CFLAGS = `dpkg-buildflags --get CFLAGS`
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -Wall
CFLAGS += -O0 LDFLAGS = `dpkg-buildflags --get LDFLAGS`
else CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
CFLAGS += -O2
endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS) MAKEFLAGS += -j$(NUMJOBS)
@ -49,7 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
cd $*-build && \ cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \ --infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
RSH=rsh \ RSH=rsh \
MANCONF="/etc/manpath.config" MANCONF="/etc/manpath.config"
cd $*-build && $(MAKE) cd $*-build && $(MAKE)