Re: gnatgcc moving from gnat to gnat-x.y
Thanks for the explanation.
Gnat-x.y should depend on an existing ada compiler (gnat-x'.y')
instead of the default compiler (gnat). Here is an attempt to
translate this change as package dependencies for gnat-4.6.
For gnat-4.9, we should prepend gnat-4.9 to the alternative. No
version is necessary, because any version of gnat-4.9 ever reaching
unstable will provide gnatgcc.
# old_revision [75515781971c9c4c611d9039f3e9d6361d723e6d]
# patch "debian/rules.conf"
============================================================
--- debian/rules.conf c0bb4a6f945a73a26ba9d970d325ea26d4cc0372
+++ debian/rules.conf d99e62e1587dcc60785f1aa3962bba4327047a73
@@ -407,17 +407,20 @@ 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)],
+ GNAT_BUILD_DEP := gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)] | gnat (>= 4.1) [$(ada_no_archs)],
+ GNAT_BUILD_DEP += gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)] | gnat (<< 4.6.1) [$(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],
- GNAT_BUILD_DEP := gnat (>= 4.1) [!arm !armhf !powerpcspe !sh4 !sparc64 !hurd-i386],
+ GNAT_BUILD_DEP := gnat-4.6 (>= 4.6.4-2) [!arm !armhf !powerpcspe !sh4 !sparc64 !hurd-i386] | gnat (>= 4.1) [!arm !armhf !powerpcspe !sh4 !sparc64 !hurd-i386],
+ GNAT_BUILD_DEP += gnat-4.6 (>= 4.6.4-2) [!arm !armhf !powerpcspe !sh4 !sparc64 !hurd-i386] | gnat (<< 4.6.1) [!arm !armhf !powerpcspe !sh4 !sparc64 !hurd-i386],
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.
- GNAT_BUILD_DEP := gnat (>= 4.1),
+ GNAT_BUILD_DEP := gnat-4.6 (>= 4.6.4-2) | gnat (>= 4.1),
+ GNAT_BUILD_DEP += gnat-4.6 (>= 4.6.4-2) | gnat (<< 4.6.1),
GNAT_BUILD_DEP += $(SOURCE_BUILD_DEP)
JAVA_BUILD_DEP :=
JAVA_BUILD_INDEP :=
Reply to: