diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-08 12:02:52 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-08 12:02:52 +0000 |
| commit | 6bc3f98dd73901c7d8c6c8079e264830aabb2634 (patch) | |
| tree | df24da8cc89feb4c4650cf60c2fe7046505d3b73 | |
| parent | 2951ec3f2c9bd51093c429401c67fd65885c4366 (diff) | |
| download | gcc-48-6bc3f98dd73901c7d8c6c8079e264830aabb2634.tar.gz | |
* Build the gcc-X.Y-base package with with_deps_on_target_arch_pkgs=yes
(Helmit Grohne). Closes: #744782.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7365 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control.m4 | 6 | ||||
| -rw-r--r-- | debian/rules.d/binary-base.mk | 4 | ||||
| -rw-r--r-- | debian/rules.defs | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 9db3e88..ad7e50e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,9 @@ gcc-4.8 (4.8.2-22) UNRELEASED; urgency=medium * Move the libstdc++ gdb pretty printers into libstdc++6, install the -gdb.py files into /usr/share/gdb/auto-load. * Set the 'Multi-Arch: same' attribute for packages, cross built with - with_deps_on_target_arch_pkgs=yes (Helmit Grohne). Closes: #744782. + with_deps_on_target_arch_pkgs=yes (Helmit Grohne). Closes: #716795. + * Build the gcc-X.Y-base package with with_deps_on_target_arch_pkgs=yes + (Helmit Grohne). Closes: #744782. -- Matthias Klose <doko@debian.org> Mon, 05 May 2014 20:29:25 +0200 diff --git a/debian/control.m4 b/debian/control.m4 index f0a96a0..1968d7e 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -126,11 +126,10 @@ define(`BASEDEP', `gnat`'PV-base (= ${gnat:Version})') define(`SOFTBASEDEP', `gnat`'PV-base (>= ${gnat:SoftVersion})') ') -ifdef(`TARGET', `', ` ifenabled(`gccbase',` Package: gcc`'PV-base -Architecture: any +Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') ifdef(`MULTIARCH', `Multi-Arch: same ')`'dnl Section: libs @@ -147,8 +146,7 @@ ifdef(`BASE_ONLY', `dnl This version of GCC is not yet available for this architecture. Please use the compilers from the gcc-snapshot package for testing. ')`'dnl -')`'dnl -')`'dnl native +')`'dnl gccbase ifenabled(`gccxbase',` dnl override default base package dependencies to cross version diff --git a/debian/rules.d/binary-base.mk b/debian/rules.d/binary-base.mk index 391cf6b..0fa3b09 100644 --- a/debian/rules.d/binary-base.mk +++ b/debian/rules.d/binary-base.mk @@ -38,7 +38,11 @@ endif dh_installchangelogs -p$(p_base) dh_compress -p$(p_base) dh_fixperms -p$(p_base) +ifeq ($(with_deps_on_target_arch_pkgs),yes) + $(cross_gencontrol) dh_gencontrol -p$(p_base) -- -v$(DEB_VERSION) $(common_substvars) +else dh_gencontrol -p$(p_base) -- -v$(DEB_VERSION) $(common_substvars) +endif dh_installdeb -p$(p_base) dh_md5sums -p$(p_base) dh_builddeb -p$(p_base) diff --git a/debian/rules.defs b/debian/rules.defs index 8db2392..5ab6c92 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -432,6 +432,8 @@ ifneq ($(DEB_STAGE),stage1) else ifneq ($(with_deps_on_target_arch_pkgs),yes) with_gccxbase := yes + else + with_gccbase := yes endif endif endif |