diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-04 16:34:39 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-04 16:34:39 +0000 |
| commit | ed0828019aa015781bdfe641e0770b05543a3c8e (patch) | |
| tree | 0e4987bf04d9568a47fc5bcc63084872c7faf679 | |
| parent | 92f70abf5068f9cfe6e82176bb84ab6e3843d58f (diff) | |
| download | gcc-49-ed0828019aa015781bdfe641e0770b05543a3c8e.tar.gz | |
* Update build dependencies for ada enabled snapshot builds.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7341 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/rules.conf | 15 | ||||
| -rw-r--r-- | debian/rules.defs | 8 |
3 files changed, 14 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 1ad1baa..cc0cc12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gcc-4.9 (4.9.0-3) UNRELEASED; urgency=medium + + * Update build dependencies for ada enabled snapshot builds. + + -- Matthias Klose <doko@debian.org> Sun, 04 May 2014 16:02:44 +0200 + gcc-4.9 (4.9.0-2) unstable; urgency=medium * Update to SVN 20140503 (r210033) from the gcc-4_9-branch. diff --git a/debian/rules.conf b/debian/rules.conf index 9c1f7bb..c1c0066 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -459,22 +459,11 @@ ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) # Build gnat as part of the combiled gcc-x.y source package. Do not fail # if gnat is not present on unsupported architectures; the build scripts # will not use gnat anyway. - #GNAT_BUILD_DEP := gnat (>= 4.1) [$(ada_no_archs)], - # Bootstrap step needs a gnatgcc symbolic link. - GNAT_BUILD_DEP := \ - gnat (>= 4.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \ - | gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \ - | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386], + GNAT_BUILD_DEP := gnat-4.9 [$(ada_no_archs)], endif else ifeq ($(single_package),yes) # Ditto, as part of the gcc-snapshot package. - # FIXME: ad hoc dependency, better fix setting of ada_no_archs - #GNAT_BUILD_DEP := gnat (>= 4.1) [$(ada_no_archs)], gcc-snapshot (>= 20090821-1) [armel armhf], - # Bootstrap step needs a gnatgcc symbolic link. - GNAT_BUILD_DEP := \ - gnat (>= 4.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \ - | gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \ - | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386], + GNAT_BUILD_DEP := gnat-4.9 [$(ada_no_archs)], else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION)) # Special source package just for gnat. Fail early if gnat is not present, # rather than waste CPU cycles and fail later. diff --git a/debian/rules.defs b/debian/rules.defs index 10e1200..6de5f92 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -517,8 +517,12 @@ ada_no_cpus := m32r sh3 sh3eb sh4 sh4eb ada_no_systems := ada_no_cross := yes ada_no_snap := no -ifneq (,$(filter $(DEB_TARGET_ARCH),m68k powerpcspe sh4 sparc64)) - ada_no_snap := yes +ifeq ($(single_package),yes) + ada_no_cpus += m68k powerpcspe sh4 sparc64 + ada_no_cpus += alpha + ifneq (,$(filter $(DEB_TARGET_ARCH),m68k powerpcspe sh4 sparc64)) + ada_no_snap := yes + endif endif ifeq ($(with_dev),yes) |