[dpkg] 144/192: debian: Remove workaround for ancient gcc w/o stackprotectorstrong support

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 2910d4924d49f536e71b748978370e9122fe3f4b
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Sep 24 18:33:34 2017 +0200

    debian: Remove workaround for ancient gcc w/o stackprotectorstrong support
---
 debian/changelog | 1 +
 debian/rules     | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6635b53..3c8c77e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,6 +130,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
     - Remove ancient code recompressing the alternatives database backups
       from xz to gzip in the dpkg daily cron job.
     - Remove Replaces and Breaks for ancient transitions.
+    - Remove workaround for ancient gcc lacking stackprotectorstrong support.
   * Test suite:
     - Enable perlcritic Documentation::RequirePodSections and
       Miscellanea::ProhibitTies.
diff --git a/debian/rules b/debian/rules
index ea0c762..27a2499 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,9 @@
 
 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 = $(if $(call cc_version_lt,4.9),-stackprotectorstrong)
-
 # Use the in-tree dpkg-buildflags
 dpkg_buildflags = \
-	DEB_BUILD_MAINT_OPTIONS="hardening=+all,$(hardening_old)" \
+	DEB_BUILD_MAINT_OPTIONS="hardening=+all" \
 	DEB_CFLAGS_MAINT_APPEND="$(WFLAGS)" \
 	DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" \
 	$(CURDIR)/run-script scripts/dpkg-buildflags.pl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git