tags 636277 patch
thanks
I've converted the package for multiarch and fixed a build failure on Ubuntu.
Changelog:
* Fix FTBFS with multiarch linux-libc-dev.
- Add multiarch.dpatch to make gcc-3.3 aware of the multiarch include path.
* Sync debian/control.m4 with debian/control.
* Build libstdc++5 for multiarch. (Closes: #636277)
diff -u gcc-3.3-3.3.6ds1/debian/rules2 gcc-3.3-3.3.6ds1/debian/rules2
--- gcc-3.3-3.3.6ds1/debian/rules2
+++ gcc-3.3-3.3.6ds1/debian/rules2
@@ -141,6 +141,8 @@
CONFARGS += --disable-multilib
endif
+CONFARGS += --with-multiarch-defaults=$(DEB_HOST_MULTIARCH)
+
ifndef DEB_CROSS
CONFARGS += $(TARGET_ALIAS)
else
diff -u gcc-3.3-3.3.6ds1/debian/control.m4 gcc-3.3-3.3.6ds1/debian/control.m4
--- gcc-3.3-3.3.6ds1/debian/control.m4
+++ gcc-3.3-3.3.6ds1/debian/control.m4
@@ -18,7 +18,7 @@
ifdef(`PRI', `', `
define(`PRI', `$1')
')
-define(`MAINTAINER', `Debian GCC Maintainers ')
+define(`MAINTAINER', `Philipp Kern ')
define(`ifenabled', `ifelse(index(enabled_languages, `$1'), -1, `dnl', `$2')')
@@ -28,12 +28,12 @@
Section: devel
Priority: PRI(standard)
Maintainer: MAINTAINER
-Uploaders: Matthias Klose , Gerhard Tonn
+Uploaders: Marc 'HE' Brockschmidt
Standards-Version: 3.6.2
ifdef(`TARGET',`dnl cross
-Build-Depends: dpkg-dev (>= 1.13.9), LIBC_BUILD_DEP, m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, bzip2, dpkg-cross (>= 1.18.1), BINUTILS_BUILD_DEP, debhelper (>= 3.0.25), bison (>= 1:1.875), flex, realpath (>= 1.9.12), lsb-release`'TARGETBD
+Build-Depends: dpkg-dev (>= 1.16.0), LIBC_BUILD_DEP, m4, autoconf2.13, automake1.4, libtool, autotools-dev, gawk, bzip2, dpkg-cross (>= 1.18.1), BINUTILS_BUILD_DEP, debhelper (>= 8.1.3), bison (>= 1:1.875), flex, realpath (>= 1.9.12), lsb-release`'TARGETBD
',`dnl native
-Build-Depends: dpkg-dev (>= 1.13.9), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], debhelper (>= 3.0.25), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [libgc_no_archs], gcc-3.4, locales [locale_no_archs !hurd-i386], procps [check_no_archs], sharutils, realpath (>= 1.9.12), lsb-release
+Build-Depends: dpkg-dev (>= 1.16.0), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, automake1.4, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], debhelper (>= 8.1.3), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [libgc_no_archs], locales [locale_no_archs !hurd-i386], procps [check_no_archs], sharutils, realpath (>= 1.9.12), lsb-release
Build-Depends-Indep: doxygen (>= 1.4.2-3), graphviz (>= 2.2), gsfonts-x11
')dnl
@@ -429,6 +429,8 @@
Architecture: ifdef(`TARGET',`all',`amd64 i386 lpia powerpc')
Section: ifdef(`TARGET',`devel',`libs')
Priority: ifdef(`TARGET',`extra',PRI(required))
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}
Description: The GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `')
This package contains an additional runtime library for C++ programs
diff -u gcc-3.3-3.3.6ds1/debian/rules.patch gcc-3.3-3.3.6ds1/debian/rules.patch
--- gcc-3.3-3.3.6ds1/debian/rules.patch
+++ gcc-3.3-3.3.6ds1/debian/rules.patch
@@ -49,6 +49,8 @@
debian_patches += libtool-rpath
+debian_patches += multiarch
+
ifeq ($(with_multiarch),yes)
debian_patches += multiarch-include
endif
diff -u gcc-3.3-3.3.6ds1/debian/control gcc-3.3-3.3.6ds1/debian/control
--- gcc-3.3-3.3.6ds1/debian/control
+++ gcc-3.3-3.3.6ds1/debian/control
@@ -4,13 +4,15 @@
Maintainer: Philipp Kern
Uploaders: Marc 'HE' Brockschmidt
Standards-Version: 3.6.2
-Build-Depends: dpkg-dev (>= 1.13.9), libc6.1-dev (>= 2.3.2.ds1-16) [alpha ia64] | libc0.3-dev [hurd-i386] | libc0.1-dev [kfreebsd-i386] | libc12-dev (>= 2.0.ds1-1) [netbsd-i386] | libc6-dev (>= 2.3.2.ds1-16), libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, automake1.4, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [!hurd-i386], bzip2, binutils (>= 2.15-7) | binutils-multiarch (>= 2.15-7), binutils-hppa64 (>= 2.15-7) [hppa], debhelper (>= 3.0.25), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [!avr], locales [!netbsd-i386 !hurd-i386 !hurd-i386], procps [!hurd-i386], sharutils, realpath (>= 1.9.12), lsb-release
+Build-Depends: dpkg-dev (>= 1.16.0), libc6.1-dev (>= 2.3.2.ds1-16) [alpha ia64] | libc0.3-dev [hurd-i386] | libc0.1-dev [kfreebsd-i386] | libc12-dev (>= 2.0.ds1-1) [netbsd-i386] | libc6-dev (>= 2.3.2.ds1-16), libc6-dev-sparc64 [sparc], li
