[gcc-7] 174/354: * dpkg-buildflags stopped fiddling around with spec files; remove the code removing and warning about dpkg's specs.

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 33d59411189f89df8de543410aa91b7fe47e80ec
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed May 3 13:29:48 2017 +0000

      * dpkg-buildflags stopped fiddling around with spec files; remove
        the code removing and warning about dpkg's specs.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9432 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog   |  2 ++
 debian/rules.conf  |  4 ++--
 debian/rules.patch | 14 +++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91ca709..15dd29f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ gcc-7 (7.1.0-3) UNRELEASED; urgency=medium
   * Fix gdc build on sparc.
   * Update the gdc-cross-install-location patch for GCC 7.
   * Bump libgphobos soname.
+  * dpkg-buildflags stopped fiddling around with spec files; remove
+    the code removing and warning about dpkg's specs.
 
  -- Matthias Klose <doko at debian.org>  Wed, 03 May 2017 13:13:20 +0200
 
diff --git a/debian/rules.conf b/debian/rules.conf
index c4af121..a46b13e 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -210,7 +210,7 @@ else
     BINUTILSBDV = 2.25-7~
   else ifneq (,$(filter $(distrelease),xenial))
     BINUTILSBDV = 2.26.1
-  else ifneq (,$(filter $(distrelease),sid stretch buster zesty))
+  else ifneq (,$(filter $(distrelease),sid stretch buster zesty artful))
     BINUTILSBDV = 2.28
   endif
 endif
@@ -495,7 +495,7 @@ ifneq (,$(filter $(distrelease), jessie))
   gnat_build_dep := gnat-4.9$(NT) [$(ada_no_archs)], g++-4.9$(NT)
 else ifneq (,$(filter $(distrelease), wheezy precise trusty wily xenial))
   gnat_build_dep := gnat-5$(NT) [$(ada_no_archs)], g++-5$(NT)
-else ifneq (,$(filter $(distrelease), stretch sid yakkety zesty))
+else ifneq (,$(filter $(distrelease), stretch sid yakkety zesty artful))
   gnat_build_dep := gnat-6$(NT) [$(ada_no_archs)], g++-6$(NT)
 else ifneq (,$(filter $(distrelease), squeeze lucid))
   gnat_build_dep :=
diff --git a/debian/rules.patch b/debian/rules.patch
index 9ac66f8..c2d74e3 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -95,17 +95,17 @@ ifneq (,$(filter $(derivative),Ubuntu))
     ifeq ($(with_pie),yes)
       hardening_patches += \
 	bind_now_when_pie
-    else
-      hardening_patches += \
-        ignore-pie-specs-when-not-enabled
+#    else
+#      hardening_patches += \
+#        ignore-pie-specs-when-not-enabled
     endif
   endif
 else ifneq (,$(filter $(derivative),Debian))
   ifneq (,$(findstring gcc-7, $(PKGSOURCE)))
-    ifneq ($(with_pie),yes)
-      hardening_patches += \
-        ignore-pie-specs-when-not-enabled
-    endif
+#    ifneq ($(with_pie),yes)
+#      hardening_patches += \
+#        ignore-pie-specs-when-not-enabled
+#    endif
   endif
 endif
 

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