diff options
Diffstat (limited to 'debian/rules.conf')
| -rw-r--r-- | debian/rules.conf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/rules.conf b/debian/rules.conf index af2c7db..66d581a 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -486,7 +486,7 @@ 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-5 [$(ada_no_archs)], + GNAT_BUILD_DEP := gnat-4.9 [$(ada_no_archs)], endif else ifeq ($(single_package),yes) # Ditto, as part of the gcc-snapshot package. @@ -804,6 +804,9 @@ endif languages += ada addons += libgnat libs source # libgmath libnof lib64gnat ssp + ifeq ($(with_gnatsjlj),yes) + addons += adasjlj + endif languages += java addons += gcj @@ -888,11 +891,11 @@ endif ifeq ($(with_separate_gnat),yes) ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) languages := $(filter-out ada,$(languages)) - addons := $(filter-out libgnat,$(addons)) + addons := $(filter-out libgnat adasjlj,$(addons)) endif ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION)) languages = ada - addons = libgnat + addons = gnatbase libgnat endif endif ifeq ($(with_separate_gdc),yes) |