fyi, attached is a diff to build gnat-4.8 from the gcc-4.8 source package.
Matthias
Index: debian/control.m4
===================================================================
--- debian/control.m4 (revision 6812)
+++ debian/control.m4 (working copy)
@@ -121,6 +121,11 @@
define(`SOFTBASEDEP', `gcj`'PV-base (>= ${gcj:SoftVersion})')
')
+ifelse(index(SRCNAME, `gnat'), 0, `
+define(`BASEDEP', `gnat`'PV-base (= ${gnat:Version})')
+define(`SOFTBASEDEP', `gnat`'PV-base (>= ${gnat:SoftVersion})')
+')
+
ifdef(`TARGET', `', `
ifenabled(`gccbase',`
@@ -3799,7 +3804,7 @@
Priority: PRI(optional)
ifdef(`MULTIARCH', `Pre-Depends: multiarch-support
')`'dnl
-Depends: gnat`'PV-base (= ${gnat:Version}), gcc`'PV (>= ${gcc:SoftVersion}),
${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Depends: BASEDEP, gcc`'PV (>= ${gcc:SoftVersion}), ${dep:libgnat},
${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
Suggests: gnat`'PV-doc, ada-reference-manual-html, ada-reference-manual-info,
ada-reference-manual-pdf, ada-reference-manual-text, gnat`'-GNAT_V-sjlj
Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5,
gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6
BUILT_USING`'dnl
@@ -3815,7 +3820,7 @@
Priority: extra
ifdef(`MULTIARCH', `Pre-Depends: multiarch-support
')`'dnl
-Depends: gnat`'PV-base (= ${gnat:Version}), gnat`'-GNAT_V (= ${gnat:Version}),
${misc:Depends}
+Depends: BASEDEP, gnat`'-GNAT_V (= ${gnat:Version}), ${misc:Depends}
BUILT_USING`'dnl
Description: GNU Ada compiler (setjump/longjump runtime library)
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3833,7 +3838,7 @@
Pre-Depends: multiarch-support
'))`'dnl
Priority: PRI(optional)
-Depends: gnat`'PV-base (= ${gnat:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
BUILT_USING`'dnl
Description: runtime for applications compiled with GNAT (shared library)
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3851,7 +3856,7 @@
Pre-Depends: multiarch-support
'))`'dnl
Priority: extra
-Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (=
${gnat:Version}), ${misc:Depends}
+Depends: BASEDEP, libgnat`'-GNAT_V (= ${gnat:Version}), ${misc:Depends}
BUILT_USING`'dnl
Description: runtime for applications compiled with GNAT (debugging symbols)
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3866,7 +3871,7 @@
Section: libdevel
Architecture: any
Priority: extra
-Depends: gnat`'PV-base (= ${gnat:Version}), gnat`'PV (= ${gnat:Version}),
+Depends: BASEDEP, gnat`'PV (= ${gnat:Version}),
libgnatvsn`'GNAT_V (= ${gnat:Version}), ${misc:Depends}
Conflicts: libgnatvsn-dev (<< `'GNAT_V), libgnatvsn4.1-dev, libgnatvsn4.3-dev,
libgnatvsn4.4-dev, libgnatvsn4.5-dev, libgnatvsn4.6-dev
BUILT_USING`'dnl
@@ -3887,7 +3892,7 @@
'))`'dnl
Priority: PRI(optional)
Section: libs
-Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (=
${gnat:Version}), ${misc:Depends}
+Depends: BASEDEP, libgnat`'-GNAT_V (= ${gnat:Version}), ${misc:Depends}
BUILT_USING`'dnl
Description: GNU Ada compiler selected components (shared library)
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3906,7 +3911,7 @@
'))`'dnl
Priority: extra
Section: debug
-Depends: gnat`'PV-base (= ${gnat:Version}), libgnatvsn`'GNAT_V (=
${gnat:Version}), ${misc:Depends}
+Depends: BASEDEP, libgnatvsn`'GNAT_V (= ${gnat:Version}), ${misc:Depends}
Suggests: gnat
BUILT_USING`'dnl
Description: GNU Ada compiler selected components (debugging symbols)
@@ -3923,7 +3928,7 @@
Section: libdevel
Architecture: any
Priority: extra
-Depends: gnat`'PV-base (= ${gnat:Version}), gnat`'PV (= ${gnat:Version}),
+Depends: BASEDEP, gnat`'PV (= ${gnat:Version}),
libgnatprj`'GNAT_V (= ${gnat:Version}), libgnatvsn`'GNAT_V-dev (=
${gnat:Version}), ${misc:Depends}
Conflicts: libgnatprj-dev (<< `'GNAT_V), libgnatprj4.1-dev, libgnatprj4.3-dev,
libgnatprj4.4-dev, libgnatprj4.5-dev, libgnatprj4.6-dev
BUILT_USING`'dnl
@@ -3947,7 +3952,7 @@
'))`'dnl
Priority: PRI(optional)
Section: libs
-Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (=
${gnat:Version}), libgnatvsn`'GNAT_V (= ${gnat:Version}), ${misc:Depends}
+Depends: BASEDEP, libgnat`'-GNAT_V (= ${gnat:Version}), libgnatvsn`'GNAT_V (=
${gnat:Version}), ${misc:Depends}
BUILT_USING`'dnl
Description: GNU Ada compiler Project Manager (shared library)
GNAT is a compiler for the Ada programming language. It produces optimized
@@ -3969,7 +3974,7 @@
'))`'dnl
Priority: extra
Section: debug
-Depends: gnat`'PV-base (= ${gnat:Version}), libgnatprj`'GNAT_V (=
${gnat:Version}), ${misc:Depends}
+Depends: BASEDEP, libgnatprj`'GNAT_V (= ${gnat:Version}), ${misc:Depends}
Suggests: gnat
BUILT_USING`'dnl
Description: GNU Ada compiler Project Manager (debugging symbols)
@@ -3991,7 +3996,7 @@
Section: libs
Architecture: biarch64_archs
Priority: PRI(optional)
-Depends: gnat`'PV-base (= ${gnat:Version}), ${dep:libcbiarch},
${shlibs:Depends}, ${misc:Depends}
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
BUILT_USING`'dnl
Description: runtime for applications compiled with GNAT (64 bits shared
library)
GNAT is a compiler for the Ada programming language. It produces optimized
Index: debian/rules.defs
===================================================================
--- debian/rules.defs (revision 6812)
+++ debian/rules.defs (working copy)
@@ -473,9 +473,9 @@
endif
ifeq ($(with_dev),yes)
- ifneq ($(separate_lang),yes)
+ #ifneq ($(separate_lang),yes)
with_ada := yes
- endif
+ #endif
endif
ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus)))
with_ada := disabled for cpu $(DEB_TARGET_ARCH_CPU)
@@ -492,7 +492,7 @@
with_ada := $(call envfilt, ada, , , $(with_ada))
ifneq ($(single_package),yes)
- with_separate_gnat := yes
+ #with_separate_gnat := yes
endif
ifeq ($(with_ada)-$(with_separate_gnat),yes-yes)
ifneq (,$(findstring gnat,$(PKGSOURCE)))
Index: debian/rules.d/binary-ada.mk
===================================================================
--- debian/rules.d/binary-ada.mk (revision 6812)
+++ debian/rules.d/binary-ada.mk (working copy)
@@ -1,4 +1,7 @@
-arch_binaries := $(arch_binaries) gnatbase ada
+ifeq ($(with_separate_gnat),yes)
+ arch_binaries := $(arch_binaries) gnatbase
+endif
+arch_binaries := $(arch_binaries) ada
ifneq ($(GFDL_INVARIANT_FREE),yes)
indep_binaries := $(indep_binaries) ada-doc
endif
@@ -8,6 +11,9 @@
endif
p_gbase = gnat-$(GNAT_VERSION)-base
+ifneq ($(with_separate_gnat),yes)
+ p_gbase = gcc$(pkg_ver)-base
+endif
p_gnat = gnat-$(GNAT_VERSION)
p_lgnat = libgnat-$(GNAT_VERSION)
p_lgnat_dbg = $(p_lgnat)-dbg
Index: debian/patches/gdc-libphobos-build.diff
===================================================================
--- debian/patches/gdc-libphobos-build.diff (revision 6812)
+++ debian/patches/gdc-libphobos-build.diff (working copy)
@@ -14,16 +14,14 @@
# run only in the target environment
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -168,7 +168,8 @@ target_libraries="target-libgcc \
+@@ -164,6 +164,7 @@
+ target-libssp \
+ target-libquadmath \
+ target-libgfortran \
++ target-libphobos \
+ target-boehm-gc \
${libgcj} \
target-libobjc \
- target-libada \
-- target-libgo"
-+ target-libgo \
-+ target-libphobos"
-
- # these tools are built using the target libraries, and are intended to
- # run only in the target environment
--- a/src/Makefile.def
+++ b/src/Makefile.def
@@ -131,6 +131,7 @@ target_modules = { module= libquadmath;
