This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 0cf46b6e677ef5f64d6543db9786ba892229f44e Author: Guillem Jover <[email protected]> Date: Thu Feb 12 02:49:13 2015 +0100 debian: Only use stackprotectorstrong when building with gcc >= 4.9 This allows to build the package on old systems, such as Debian wheezy. --- debian/changelog | 1 + debian/rules | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 99f06a3..179df9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low * Add ‘.mailmap’ to the default dpkg-source ignore lists. * Remove old trigger related Breaks and Conflicts from dpkg. * Set the SE Linux context on «dpkg-statoverride --update». Closes: #690361 + * Only use stackprotectorstrong when building dpkg with gcc >= 4.9. [ Raphaël Hertzog ] * Drop myself from Uploaders. diff --git a/debian/rules b/debian/rules index 474d334..efd4b5e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,14 @@ WFLAGS := -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers +# XXX: Stack Protector Strong is only available in gcc >= 4.9 +cc_version = $(shell $(CC) -dumpversion 2>/dev/null) +cc_version_lt = $(shell dpkg --compare-versions "$(cc_version)" lt-nl "$(1)" && echo yes) +hardening_old = DEB_BUILD_MAINT_OPTIONS="hardening=-stackprotectorstrong" + # Use the in-tree dpkg-buildflags dpkg_buildflags = \ + $(if $(call cc_version_lt,4.9),$(hardening_old)) \ DEB_CFLAGS_MAINT_APPEND="$(WFLAGS)" \ DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" \ $(CURDIR)/run-script perl $(CURDIR)/scripts/dpkg-buildflags.pl -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
