[gcc-6] 331/401: * Fix ignoring dpkg's pie specs when pie is not enabled (James Clarke). Closes: #849542.

[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 681b302e15e98300a93fd5f4ac620fc07d1d0fe3
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Dec 29 04:09:34 2016 +0000

      * Fix ignoring dpkg's pie specs when pie is not enabled (James Clarke).
        Closes: #849542.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9202 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                                      | 2 ++
 debian/patches/ignore-pie-specs-when-not-enabled.diff | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1a9cc24..5f67f13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ gcc-6 (6.3.0-1) UNRELEASED; urgency=medium
   * Don't mark libphobos multilib packages as M-A: same.
   * Configure libphobos builds with --with-target-system-zlib.
   * Stop applying PR c++/77379.
+  * Fix ignoring dpkg's pie specs when pie is not enabled (James Clarke).
+    Closes: #849542.
 
   [ Samuel Thibault ]
   * libgo fixup for program invocation name.
diff --git a/debian/patches/ignore-pie-specs-when-not-enabled.diff b/debian/patches/ignore-pie-specs-when-not-enabled.diff
index a00c613..8f5cc09 100644
--- a/debian/patches/ignore-pie-specs-when-not-enabled.diff
+++ b/debian/patches/ignore-pie-specs-when-not-enabled.diff
@@ -46,7 +46,7 @@ Index: b/src/gcc/gcc.c
  
      case OPT_specs_:
 +      if (ignore_pie_specs_when_not_enabled("DEB_BUILD_MAINT_OPTIONS", arg)
-+	  || ignore_pie_specs_when_not_enabled("DEB_BUILD_OPTIONS", arg))
++	  && ignore_pie_specs_when_not_enabled("DEB_BUILD_OPTIONS", arg))
 +	{
 +	  inform (0, "pie specs %s ignored when pie is not enabled", arg);
 +	  return true;

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