[gcc-6] 244/401: * For Debian builds, don't enable bind now by default when linking with pie by default.

[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 gcc-6.

commit ae00c4ac5f8f0bfaac3417f9569ce3e435fc6765
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Oct 27 14:00:19 2016 +0000

      * For Debian builds, don't enable bind now by default when linking with pie
        by default.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9019 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog   | 4 +++-
 debian/rules.patch | 9 +--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1f118f..9626a6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gcc-6 (6.2.0-10) UNRELEASED; urgency=medium
+gcc-6 (6.2.0-10) unstable; urgency=medium
 
   * Update to SVN 20161027 (r241619, 6.2.1) from the gcc-6-branch.
     - Fix PR libstdc++/77288, PR libstdc++/77727, PR libstdc++/78052,
@@ -12,6 +12,8 @@ gcc-6 (6.2.0-10) UNRELEASED; urgency=medium
     Closes: #841292.
   * Don't install alternatives for go and gofmt. The preferred way to do that
     is to install the golang-any package.
+  * For Debian builds, don't enable bind now by default when linking with pie
+    by default.
 
  -- Matthias Klose <doko at debian.org>  Thu, 27 Oct 2016 15:27:07 +0200
 
diff --git a/debian/rules.patch b/debian/rules.patch
index df1d1b0..39b77b9 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -124,14 +124,7 @@ ifeq ($(with_ssp)-$(with_ssp_default),yes-yes)
     hardening_patches += gcc-default-ssp-strong
   endif
 endif
-ifeq ($(distribution),Debian)
-  ifneq (,$(findstring gcc-6, $(PKGSOURCE)))
-    ifeq ($(with_pie),yes)
-      hardening_patches += \
-	bind_now_when_pie
-    endif
-  endif
-else ifeq ($(distribution),Ubuntu)
+ifeq ($(distribution),Ubuntu)
   ifneq (,$(findstring gcc-6, $(PKGSOURCE)))
     hardening_patches += \
 	gcc-default-fortify-source \

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