Hey all, Follow-on patch to handle the Multi-Arch fields to debian/control when with_multiarch_lib is set in the makefiles.
Also pushed to the bzr repo: https://code.launchpad.net/~vorlon/gcc/multiarch-packaging/ Matthias, please let me know if there's some other way you would like this submitted for inclusion in the Debian package. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/changelog'
--- debian/changelog 2010-07-28 00:57:36 +0000
+++ debian/changelog 2010-08-05 05:32:19 +0000
@@ -22,6 +22,8 @@
our biarch (multilib) builds need to remain independent of multiarch in
the near term, so we want to make sure we can find /usr/lib32 without
/usr/lib/i486-linux-gnu being available.
+ * debian/control.m4, debian/rules.conf: conditionally set packages to be
+ Multi-Arch: yes when MULTIARCH is defined.
-- Matthias Klose <d...@debian.org> Fri, 23 Jul 2010 10:12:45 +0200
=== modified file 'debian/control.m4'
--- debian/control.m4 2010-07-23 09:37:30 +0000
+++ debian/control.m4 2010-08-05 05:32:19 +0000
@@ -103,6 +103,8 @@
Package: gcc`'PV-base
Architecture: any
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
Section: libs
Priority: PRI(required)
Depends: ${misc:Depends}
@@ -166,7 +168,8 @@
Priority: ifdef(`TARGET',`extra',required)
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1
-',`')`'dnl
+',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
Shared version of the support library, a library of internal subroutines
that GCC uses to overcome shortcomings of particular machines, or
@@ -182,6 +185,8 @@
Section: debug
Priority: extra
Depends: BASEDEP, libgcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends}
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `')
Debug symbols for the GCC support library.
ifdef(`TARGET', `dnl
@@ -196,7 +201,8 @@
Priority: ifdef(`TARGET',`extra',required)
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libgcc2-TARGET-dcv1
-',`')`'dnl
+',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
Shared version of the support library, a library of internal subroutines
that GCC uses to overcome shortcomings of particular machines, or
@@ -212,6 +218,8 @@
Section: debug
Priority: extra
Depends: BASEDEP, libgcc2`'LS (= ${gcc:Version}), ${misc:Depends}
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `')
Debug symbols for the GCC support library.
ifdef(`TARGET', `dnl
@@ -369,6 +377,8 @@
ifenabled(`libgmath',`
Package: libgccmath`'GCCMATH_SO
Architecture: i386
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
Section: libs
Priority: PRI(optional)
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
@@ -560,6 +570,8 @@
ifenabled(`libmudf',`
Package: libmudflap`'MF_SO`'LS
Architecture: any
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
Section: libs
Priority: PRI(optional)
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
@@ -569,6 +581,8 @@
Package: libmudflap`'MF_SO-dbg`'LS
Architecture: ifdef(`TARGET',`all',`any')
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
Section: debug
Priority: extra
Depends: BASEDEP, libmudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends}
@@ -653,6 +667,8 @@
ifenabled(`ssp',`
Package: libssp`'SSP_SO
Architecture: any
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
Section: libs
Priority: PRI(optional)
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
@@ -701,6 +717,8 @@
Package: libgomp`'GOMP_SO`'LS
Section: ifdef(`TARGET',`devel',`libs')
Architecture: ifdef(`TARGET',`all',`any')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Priority: ifdef(`TARGET',`extra',`PRI(optional)')
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
Description: GCC OpenMP (GOMP) support library
@@ -712,6 +730,8 @@
Section: debug
Priority: extra
Depends: BASEDEP, libgomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends}
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Description: GCC OpenMP (GOMP) support library (debug symbols)
GOMP is an implementation of OpenMP for the C, C++, and Fortran 95 compilers
in the GNU Compiler Collection.
@@ -859,6 +879,8 @@
Package: libobjc`'OBJC_SO`'LS
Section: ifdef(`TARGET',`devel',`libs')
Architecture: ifdef(`TARGET',`all',`any')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Priority: ifdef(`TARGET',`extra',`PRI(optional)')
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
Description: Runtime library for GNU Objective-C applications
@@ -867,6 +889,8 @@
Package: libobjc`'OBJC_SO-dbg`'LS
Section: debug
Architecture: ifdef(`TARGET',`all',`any')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Priority: extra
Depends: BASEDEP, libobjc`'OBJC_SO`'LS (= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS, ${misc:Depends}
Description: Runtime library for GNU Objective-C applications (debug symbols)
@@ -985,6 +1009,8 @@
Package: libgfortran`'FORTRAN_SO`'LS
Section: ifdef(`TARGET',`devel',`libs')
Architecture: ifdef(`TARGET',`all',`any')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Priority: ifdef(`TARGET',`extra',PRI(optional))
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
Description: Runtime library for GNU Fortran applications
@@ -994,6 +1020,8 @@
Package: libgfortran`'FORTRAN_SO-dbg`'LS
Section: debug
Architecture: ifdef(`TARGET',`all',`any')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Priority: extra
Depends: BASEDEP, libgfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends}
Description: Runtime library for GNU Fortran applications (debug symbols)
@@ -1066,6 +1094,8 @@
Package: libgfortran`'FORTRAN_SO-neon
Section: libs
Architecture: NEON_ARCHS
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
Priority: extra
Depends: BASEDEP, libgcc1-neon, ${shlibs:Depends}, ${misc:Depends}
Description: Runtime library for GNU Fortran applications [NEON version]
@@ -1272,7 +1302,8 @@
Priority: ifdef(`TARGET',`extra',PRI(required))
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1
-',`')`'dnl
+',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Conflicts: scim (<< 1.4.2-1)
Description: The GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `')
This package contains an additional runtime library for C++ programs
=== modified file 'debian/rules.conf'
--- debian/rules.conf 2010-07-23 08:08:29 +0000
+++ debian/rules.conf 2010-08-05 05:32:19 +0000
@@ -532,6 +532,11 @@
-DBASE_ONLY=yes
endif
+ifeq ($(with_multiarch_lib),yes)
+ ctrl_flags += \
+ -DMULTIARCH=yes
+endif
+
control: control-file readme-bugs-file parameters-file copyright-file substvars-file versioned-files
languages = c c++ fortran objc objpp
signature.asc
Description: Digital signature
