[gcc-7] 190/354: * Fix gnat build dependencies on x32.

[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 a67f7a6b0a8bd61881c6ac1810ffdbfa4f6a43b2
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon May 15 23:29:07 2017 +0000

      * Fix gnat build dependencies on x32.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9478 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 +
 debian/control    | 2 +-
 debian/rules.conf | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21d553d..a0f1705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gcc-7 (7.1.0-6) UNRELEASED; urgency=medium
   * Re-add unwind support on kfreebsd-amd64 (James Clarke).
   * Work around #814977 (gnat calling gcc-7-7) by providing a gcc-7-7
     symlink.
+  * Fix gnat build dependencies on x32.
 
  -- Matthias Klose <doko at debian.org>  Mon, 15 May 2017 16:22:37 -0700
 
diff --git a/debian/control b/debian/control
index c57d049..5e069ad 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   gdb:native, nvptx-tools [amd64], 
   texinfo (>= 4.3), locales, sharutils, 
-  procps, gnat-6:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !m68k !mips64 !x32], gnat-7 [x32], g++-6:native, netbase, 
+  procps, gnat-6:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !m68k !mips64 !x32], g++-7 [x32], gnat-7 [x32], g++-6:native, netbase, 
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), lib32z1-dev [amd64 kfreebsd-amd64], lib64z1-dev [i386], 
   dejagnu [!m68k !hurd-amd64 !hurd-i386 !hurd-alpha !kfreebsd-amd64 !kfreebsd-i386 !kfreebsd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, quilt, 
   pkg-config, libgc-dev, 
diff --git a/debian/rules.conf b/debian/rules.conf
index 5172932..3464c5d 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -496,7 +496,7 @@ ifneq (,$(filter $(distrelease), jessie))
 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 buster sid yakkety zesty artful))
-  gnat_build_dep := gnat-6$(NT) [$(ada_no_archs) !x32], gnat-7 [x32], g++-6$(NT)
+  gnat_build_dep := gnat-6$(NT) [$(ada_no_archs) !x32], g++-7 [x32], gnat-7 [x32], g++-6$(NT)
 else ifneq (,$(filter $(distrelease), squeeze lucid))
   gnat_build_dep :=
 else

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