debian/changelog | 10 ++++++++++
debian/rules | 16 +++++++++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 1c4a38517c2195aa8751cc8af43e73ee6dde1f62
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Oct 15 17:53:47 2011 +0200
Drop dh_testroot from clean target.
diff --git a/debian/changelog b/debian/changelog
index c88e287..a33b79b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.11.1-2) UNRELEASED; urgency=low
* Enable PIE with DEB_BUILD_MAINT_OPTIONS, but add -Bsymbolic to LDFLAGS to
reduce performance loss from PIE.
* Pass --disable-silent-rules to configure.
+ * Drop dh_testroot from clean target.
-- Julien Cristau <jcris...@debian.org> Sat, 01 Oct 2011 00:31:58 +0200
diff --git a/debian/rules b/debian/rules
index bc0de7c..aa48045 100755
--- a/debian/rules
+++ b/debian/rules
@@ -230,7 +230,6 @@ endif
clean: unpatch abibumpcheck
dh_testdir
- dh_testroot
rm -rf $(STAMP_DIR)
rm -f config.cache config.log config.status
commit 32afd9daef7f14b8a6fc5bff99b469ca0bdacf0a
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Oct 13 19:58:15 2011 +0200
Pass --disable-silent-rules to configure.
diff --git a/debian/changelog b/debian/changelog
index 7867483..c88e287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.11.1-2) UNRELEASED; urgency=low
* Use dpkg-buildflags to enable hardening with recent dpkg.
* Enable PIE with DEB_BUILD_MAINT_OPTIONS, but add -Bsymbolic to LDFLAGS to
reduce performance loss from PIE.
+ * Pass --disable-silent-rules to configure.
-- Julien Cristau <jcris...@debian.org> Sat, 01 Oct 2011 00:31:58 +0200
diff --git a/debian/rules b/debian/rules
index 404c8a4..bc0de7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,6 +100,7 @@ BUILDER := $(shell dpkg-parsechangelog | awk -F': '
'/^Maintainer: / {pri
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
+ --disable-silent-rules \
--disable-static \
--without-dtrace \
--disable-strict-compilation \
commit fd76df7c241a2cf488a5df9e64d2bd6ae503db78
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Oct 13 19:56:56 2011 +0200
Enable PIE with DEB_BUILD_MAINT_OPTIONS
But add -Bsymbolic to LDFLAGS to reduce performance loss from PIE.
diff --git a/debian/changelog b/debian/changelog
index d3de88b..7867483 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.11.1-2) UNRELEASED; urgency=low
* Use dpkg-buildflags to enable hardening with recent dpkg.
+ * Enable PIE with DEB_BUILD_MAINT_OPTIONS, but add -Bsymbolic to LDFLAGS to
+ reduce performance loss from PIE.
-- Julien Cristau <jcris...@debian.org> Sat, 01 Oct 2011 00:31:58 +0200
diff --git a/debian/rules b/debian/rules
index 7c06c70..404c8a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ include /usr/share/quilt/quilt.make
# we don't have a good way to check for dpkg-dev version, so use presence of
# buildflags.mk as a substitute.
ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
-vars = $(shell DEB_CPPFLAGS_APPEND="-DPRE_RELEASE=0" dpkg-buildflags
--export=configure)
+vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie"
DEB_LDFLAGS_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_APPEND="-DPRE_RELEASE=0"
dpkg-buildflags --export=configure)
else
CFLAGS = -Wall -g
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
commit 4e0e119b6ae1cba17c3919038c93446efdaddbbb
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Oct 1 00:32:19 2011 +0200
Use dpkg-buildflags to enable hardening with recent dpkg.
diff --git a/debian/changelog b/debian/changelog
index afbed11..d3de88b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.11.1-2) UNRELEASED; urgency=low
+
+ * Use dpkg-buildflags to enable hardening with recent dpkg.
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 01 Oct 2011 00:31:58 +0200
+
xorg-server (2:1.11.1-1) unstable; urgency=high
[ Cyril Brulebois ]
diff --git a/debian/rules b/debian/rules
index d000ed4..7c06c70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,19 +16,26 @@ $(STAMP_DIR)/stampdir:
include /usr/share/quilt/quilt.make
+# we don't have a good way to check for dpkg-dev version, so use presence of
+# buildflags.mk as a substitute.
+ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
+vars = $(shell DEB_CPPFLAGS_APPEND="-DPRE_RELEASE=0" dpkg-buildflags
--export=configure)
+else
CFLAGS = -Wall -g
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
+CPPFLAGS = -DPRE_RELEASE=0
+vars = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+endif
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
-CPPFLAGS += -DPRE_RELEASE=0
-
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)
@@ -201,8 +208,7 @@ $(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf
--localstatedir=/var \
$(confflags) \
$(confflags_$*) \
- CFLAGS="$(CFLAGS)" \
- CPPFLAGS="$(CPPFLAGS)"
+ $(vars)
>$@
$(STAMP_DIR)/build-%: $(STAMP_DIR)/configure-%
--
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/e1rf6zx-0007x7...@vasks.debian.org
