[gcc-6] 280/401: * Always apply *all* the gnat patches whether or not gnat is built.

[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 fa0e823a83fdbaea4c10eb1484d6611123a6ebca
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Nov 18 18:57:35 2016 +0000

      * Always apply *all* the gnat patches whether or not gnat is built.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9094 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog   | 1 +
 debian/rules.patch | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cdf50b9..5024aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gcc-6 (6.2.1-4) unstabe; urgency=medium
 
   * Build the GC enabled libobjc using the system libgc when available
+  * Always apply *all* the gnat patches whether or not gnat is built.
 
  -- Matthias Klose <doko at debian.org>  Fri, 18 Nov 2016 19:45:22 +0100
 
diff --git a/debian/rules.patch b/debian/rules.patch
index d0a4c2e..3a4052b 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -167,7 +167,7 @@ debian_patches += ada-revert-pr63225
 	ada-nobiarch-check
   endif
 
-  ifeq ($(with_libgnat),yes)
+  #ifeq ($(with_libgnat),yes)
     debian_patches += \
 	ada-link-lib \
 	ada-libgnatvsn \
@@ -179,11 +179,11 @@ debian_patches += ada-revert-pr63225
       debian_patches += \
 	libgnatprj-link
     endif
-  endif
-  ifeq ($(with_gnatsjlj),yes)
+  #endif
+  #ifeq ($(with_gnatsjlj),yes)
     debian_patches += \
 	ada-sjlj
-  endif
+  #endif
 
   debian_patches += ada-link-shlib
 #endif

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