[gcc-7] 186/354: * Build gnat on x32.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit 37a90abc37e735ce1cf4ea4af3219768e1c0e669
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun May 14 15:57:39 2017 +0000
* Build gnat on x32.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9462 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 1 +
debian/control | 4 ++--
debian/rules.conf | 6 +++---
debian/rules.defs | 5 ++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c88e5c4..542d66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gcc-7 (7.1.0-5) UNRELEASED; urgency=medium
* Disable offload compilers for snapshot builds.
* Build libgo when not building common libs.
* Fix building libgfortran and libgphobos when building without common libs.
+ * Build gnat on x32.
-- Matthias Klose <doko at debian.org> Sun, 14 May 2017 08:50:34 -0700
diff --git a/debian/control b/debian/control
index a7b8308..c57d049 100644
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,11 @@ 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], g++-6:native, netbase,
+ procps, gnat-6:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !m68k !mips64 !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,
- g++-7-alpha-linux-gnu [alpha] <cross>, gobjc-7-alpha-linux-gnu [alpha] <cross>, gfortran-7-alpha-linux-gnu [alpha] <cross>, gdc-7-alpha-linux-gnu [alpha] <cross>, gccgo-7-alpha-linux-gnu [alpha] <cross>, gnat-7-alpha-linux-gnu [alpha] <cross>, g++-7-x86-64-linux-gnu [amd64] <cross>, gobjc-7-x86-64-linux-gnu [amd64] <cross>, gfortran-7-x86-64-linux-gnu [amd64] <cross>, gdc-7-x86-64-linux-gnu [amd64] <cross>, gccgo-7-x86-64-linux-gnu [amd64] <cross>, gnat-7-x86-64-linux-gnu [amd64] <cro [...]
+ g++-7-alpha-linux-gnu [alpha] <cross>, gobjc-7-alpha-linux-gnu [alpha] <cross>, gfortran-7-alpha-linux-gnu [alpha] <cross>, gdc-7-alpha-linux-gnu [alpha] <cross>, gccgo-7-alpha-linux-gnu [alpha] <cross>, gnat-7-alpha-linux-gnu [alpha] <cross>, g++-7-x86-64-linux-gnu [amd64] <cross>, gobjc-7-x86-64-linux-gnu [amd64] <cross>, gfortran-7-x86-64-linux-gnu [amd64] <cross>, gdc-7-x86-64-linux-gnu [amd64] <cross>, gccgo-7-x86-64-linux-gnu [amd64] <cross>, gnat-7-x86-64-linux-gnu [amd64] <cro [...]
Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns
Homepage: http://gcc.gnu.org/
Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-7/
diff --git a/debian/rules.conf b/debian/rules.conf
index a46b13e..5172932 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -468,7 +468,7 @@ else
gdc-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \
$(if $(filter $(a), hppa m68k sh4),, \
gccgo-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \
- $(if $(filter $(a), m68k mips64 powerpcspe sh4 sparc64 x32),, \
+ $(if $(filter $(a), m68k mips64 powerpcspe sh4 sparc64),, \
gnat-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \
)
pf_cross = $(SPACE)<cross>
@@ -495,8 +495,8 @@ 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 artful))
- gnat_build_dep := gnat-6$(NT) [$(ada_no_archs)], g++-6$(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)
else ifneq (,$(filter $(distrelease), squeeze lucid))
gnat_build_dep :=
else
diff --git a/debian/rules.defs b/debian/rules.defs
index 38a64de..1397bf9 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -644,7 +644,6 @@ ada_no_cpus := m32r sh3 sh3eb sh4eb
ada_no_cpus += powerpcspe
ada_no_cpus += m68k # see https://bugs.debian.org/814221
ada_no_cpus += mips64 # see https://gcc.gnu.org/PR65337
-ada_no_cpus += x32 # see https://gcc.gnu.org/PR61954
ada_no_systems :=
ada_no_cross := no
ada_no_snap := no
@@ -666,7 +665,7 @@ endif
ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus)))
with_ada := disabled for cpu $(DEB_TARGET_ARCH_CPU)
endif
-ifneq (,$(filter $(DEB_TARGET_ARCH),powerpcspe x32))
+ifneq (,$(filter $(DEB_TARGET_ARCH),powerpcspe))
with_ada := disabled for architecture $(DEB_TARGET_ARCH)
endif
ifneq (,$(filter $(DEB_TARGET_ARCH),kfreebsd-i386 kfreebsd-amd64 hurd-i386))
@@ -678,7 +677,7 @@ ifeq (,$(findstring cross,$(build_type)))
endif
endif
ifneq (,$(findstring cross,$(build_type)))
- ifneq (,$(filter $(DEB_BUILD_ARCH),powerpcspe x32))
+ ifneq (,$(filter $(DEB_BUILD_ARCH),powerpcspe))
with_ada := no gnat host compiler on $(DEB_BUILD_ARCH)
endif
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list