[gcc-6] 133/401: * Re-enable build gnat on some architectures for snapshot builds. * Don't build gnat cross compilers on 32bit archs targeting 64bit targets. Addresses: #823126. * Avoid empty architecture lists in build dependencies. Closes: #823280.

[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 d077386cbca5dae097142f14a5a06a82a228a78f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu May 5 19:50:35 2016 +0000

      * Re-enable build gnat on some architectures for snapshot builds.
      * Don't build gnat cross compilers on 32bit archs targeting 64bit targets.
        Addresses: #823126.
      * Avoid empty architecture lists in build dependencies. Closes: #823280.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8826 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  6 +++++-
 debian/rules.conf |  4 +++-
 debian/rules.defs | 19 +++++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8edfd5..3ac96f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,15 @@ gcc-6 (6.1.1-2) UNRELEASED; urgency=medium
     cross compiler.
   * Fix building cross gnat libs when not building the common libs.
   * Fix building cross mips* multilibs when not building the common libs.
+  * Re-enable build gnat on some architectures for snapshot builds.
+  * Don't build gnat cross compilers on 32bit archs targeting 64bit targets.
+    Addresses: #823126.
+  * Avoid empty architecture lists in build dependencies. Closes: #823280.
 
   [ Samuel Thibault ]
   * patches/ada-hurd.diff: Fix Get_Page_Size type.
 
- -- Matthias Klose <doko at debian.org>  Sat, 30 Apr 2016 16:38:17 +0200
+ -- Matthias Klose <doko at debian.org>  Thu, 05 May 2016 21:34:06 +0200
 
 gcc-6 (6.1.1-1) unstable; urgency=medium
 
diff --git a/debian/rules.conf b/debian/rules.conf
index 2573396..5b8b2ba 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -363,7 +363,9 @@ endif
 
 # needed for the include/asm symlink to run the testsuite for
 # non default multilibs
-GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)]$(pf_ncross),
+ifneq (,$(multilib_archs))
+  GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)]$(pf_ncross),
+endif
 GCC_MULTILIB_BUILD_DEP += g++-5 [arm64]$(pf_ncross),
 
 LIBUNWIND_DEV_DEP := libunwind7-dev$(LS)$(AQ) (>= 0.98.5-6)
diff --git a/debian/rules.defs b/debian/rules.defs
index fbddaa5..6a46b3c 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -603,11 +603,10 @@ ada_no_systems	:=
 ada_no_cross	:= no
 ada_no_snap	:= no
 ifeq ($(single_package),yes)
-  ada_no_cpus += m68k powerpcspe sh4 sparc64
-  ada_no_cpus += alpha
-  ifneq (,$(filter $(DEB_TARGET_ARCH),m68k mips mipsel powerpcspe sh4 sparc64 hurd-i386 kfreebsd-i386 kfreebsd-amd64))
-    ada_no_cpus += mips mipsel
-    ada_no_cpus += hurd-i386 kfreebsd-i386 kfreebsd-amd64
+  ada_no_cpus += powerpcspe
+  ifneq (,$(filter $(DEB_TARGET_ARCH),mips mipsel powerpcspe kfreebsd-i386 kfreebsd-amd64))
+    #ada_no_cpus += mips mipsel
+    ada_no_cpus += kfreebsd-i386 kfreebsd-amd64
     ada_no_snap := yes
   endif
 endif
@@ -624,7 +623,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH),powerpcspe x32))
   with_ada := disabled for architecture $(DEB_TARGET_ARCH)
 endif
 ifneq (,$(findstring cross,$(build_type)))
-  ifneq (,$(filter $(DEB_BUILD_ARCH),m68k powerpcspe sh4 x32))
+  ifneq (,$(filter $(DEB_BUILD_ARCH),powerpcspe x32))
     with_ada := no gnat host compiler on $(DEB_BUILD_ARCH)
   endif
 endif
@@ -643,6 +642,14 @@ endif
 ifneq (,$(filter $(distrelease),lucid))
   with_ada :=
 endif
+# disable building gnat cross compilers on 32bit archs targeting 64bit archs
+ifneq (,$(filter $(build_type), build-cross cross-build-cross))
+  ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel i386 mips mipsel powerpc))
+    ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 arm64 mips64 mips64el ppc64 ppc64el s390x sparc64))
+      with_ada := disabled on 32bit archs targeting 64bit archs
+    endif
+  endif
+endif
 with_ada := $(call envfilt, ada, , , $(with_ada))
 
 #with_ada := disabled for GCC 6

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