diff -u gcc-4.7-4.7.2/debian/changelog gcc-4.7-4.7.2/debian/changelog --- gcc-4.7-4.7.2/debian/changelog +++ gcc-4.7-4.7.2/debian/changelog @@ -1,3 +1,14 @@ +gcc-4.7 (4.7.2-4+rpi1) wheezy; urgency=low + + * Set defaults for raspbian (ARMv6+VFP) + * Disable testsuite + * Include a copy of multiarch cross patches from + http://emdebian.org/~thibg/patches/gcc-4.7/4.7.1-8/ in + debian/thibgpatches don't apply them because i'm not sure what impact + they will have on native builds. + + -- Peter Michael Green Thu, 13 Sep 2012 21:40:45 +0000 + gcc-4.7 (4.7.2-4) unstable; urgency=low * Fix PR c++/54858 (ice on valid), taken from the branch. diff -u gcc-4.7-4.7.2/debian/control gcc-4.7-4.7.2/debian/control --- gcc-4.7-4.7.2/debian/control +++ gcc-4.7-4.7.2/debian/control @@ -154,7 +154,7 @@ Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), cpp-4.7 (= ${gcc:Version}), binutils (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} Recommends: ${dep:libcdev} -Suggests: ${gcc:multilib}, libmudflap0-4.7-dev (>= ${gcc:Version}), gcc-4.7-doc (>= ${gcc:SoftVersion}), gcc-4.7-locales (>= ${gcc:SoftVersion}), libgcc1-dbg, libgomp1-dbg, libitm1-dbg, libquadmath0-dbg, libmudflap0-dbg, ${dep:libcloog}, ${dep:gold} +Suggests: ${gcc:multilib}, libmudflap0-4.7-dev (>= ${gcc:Version}), gcc-4.7-doc (>= ${gcc:SoftVersion}), gcc-4.7-locales (>= ${gcc:SoftVersion}), libgcc1-dbg, libgomp1-dbg, libitm1-dbg, libquadmath-dbg, libmudflap0-dbg, ${dep:libcloog}, ${dep:gold} Provides: c-compiler Description: GNU C compiler This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -440,172 +440,6 @@ Description: GCC OpenMP (GOMP) support library (n32 debug symbols) GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers -Package: libitm1 -Section: libs -Architecture: any -Multi-Arch: same -Pre-Depends: multiarch-support -Provides: libitm1-armel [armel], libitm1-armhf [armhf] -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: GNU Transactional Memory Library - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: libitm1-dbg -Architecture: any -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libitm1 (= ${gcc:Version}), ${misc:Depends} -Multi-Arch: same -Provides: libitm1-dbg-armel [armel], libitm1-dbg-armhf [armhf] -Description: GNU Transactional Memory Library (debug symbols) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: lib32itm1 -Section: libs -Architecture: amd64 ppc64 kfreebsd-amd64 s390x -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: ${confl:lib32} -Description: GNU Transactional Memory Library (32bit) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: lib32itm1-dbg -Architecture: amd64 ppc64 kfreebsd-amd64 s390x -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), lib32itm1 (= ${gcc:Version}), ${misc:Depends} -Description: GNU Transactional Memory Library (32 bit debug symbols) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: lib64itm1 -Section: libs -Architecture: i386 powerpc sparc s390 mips mipsel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Description: GNU Transactional Memory Library (64bit) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: lib64itm1-dbg -Architecture: i386 powerpc sparc s390 mips mipsel -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), lib64itm1 (= ${gcc:Version}), ${misc:Depends} -Description: GNU Transactional Memory Library (64bit debug symbols) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: libn32itm1 -Section: libs -Architecture: mips mipsel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Description: GNU Transactional Memory Library (n32) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: libn32itm1-dbg -Architecture: mips mipsel -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libn32itm1 (= ${gcc:Version}), ${misc:Depends} -Description: GNU Transactional Memory Library (n32 debug symbols) - GNU Transactional Memory Library (libitm) provides transaction support for - accesses to the memory of a process, enabling easy-to-use synchronization of - accesses to shared memory by several threads. - -Package: libquadmath0 -Section: libs -Architecture: any -Multi-Arch: same -Pre-Depends: multiarch-support -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: GCC Quad-Precision Math Library - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. The library is used to provide on such - targets the REAL(16) type in the GNU Fortran compiler. - -Package: libquadmath0-dbg -Architecture: any -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libquadmath0 (= ${gcc:Version}), ${misc:Depends} -Multi-Arch: same -Description: GCC Quad-Precision Math Library (debug symbols) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. - -Package: lib32quadmath0 -Section: libs -Architecture: amd64 ppc64 kfreebsd-amd64 s390x -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: ${confl:lib32} -Description: GCC Quad-Precision Math Library (32bit) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. The library is used to provide on such - targets the REAL(16) type in the GNU Fortran compiler. - -Package: lib32quadmath0-dbg -Architecture: amd64 ppc64 kfreebsd-amd64 s390x -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), lib32quadmath0 (= ${gcc:Version}), ${misc:Depends} -Description: GCC Quad-Precision Math Library (32 bit debug symbols) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. - -Package: lib64quadmath0 -Section: libs -Architecture: i386 powerpc sparc s390 mips mipsel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Description: GCC Quad-Precision Math Library (64bit) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. The library is used to provide on such - targets the REAL(16) type in the GNU Fortran compiler. - -Package: lib64quadmath0-dbg -Architecture: i386 powerpc sparc s390 mips mipsel -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), lib64quadmath0 (= ${gcc:Version}), ${misc:Depends} -Description: GCC Quad-Precision Math Library (64bit debug symbols) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. - -Package: libn32quadmath0 -Section: libs -Architecture: mips mipsel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Description: GCC Quad-Precision Math Library (n32) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. The library is used to provide on such - targets the REAL(16) type in the GNU Fortran compiler. - -Package: libn32quadmath0-dbg -Architecture: mips mipsel -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libn32quadmath0 (= ${gcc:Version}), ${misc:Depends} -Description: GCC Quad-Precision Math Library (n32 debug symbols) - A library, which provides quad-precision mathematical functions on targets - supporting the __float128 datatype. - Package: gobjc++-4.7 Architecture: any Priority: optional diff -u gcc-4.7-4.7.2/debian/rules.parameters gcc-4.7-4.7.2/debian/rules.parameters --- gcc-4.7-4.7.2/debian/rules.parameters +++ gcc-4.7-4.7.2/debian/rules.parameters @@ -2,15 +2,15 @@ GCC_VERSION := 4.7.2 NEXT_GCC_VERSION := 4.7.3 BASE_VERSION := 4.7 -SOURCE_VERSION := 4.7.2-4 -DEB_VERSION := 4.7.2-4 -DEB_EVERSION := 1:4.7.2-4 +SOURCE_VERSION := 4.7.2-4+rpi1 +DEB_VERSION := 4.7.2-4+rpi1 +DEB_EVERSION := 1:4.7.2-4+rpi1 GDC_BASE_VERSION := DEB_GDC_VERSION := DEB_SOVERSION := 4.7 DEB_SOEVERSION := 1:4.7 DEB_LIBGCC_SOVERSION := 1:4.7 -DEB_LIBGCC_VERSION := 1:4.7.2-4 +DEB_LIBGCC_VERSION := 1:4.7.2-4+rpi1 DEB_STDCXX_SOVERSION := 4.7 DEB_GCJ_SOVERSION := 4.7 PKG_GCJ_EXT := 13 @@ -29,7 +29,7 @@ SSP_SONAME := 0 GOMP_SONAME := 1 ITM_SONAME := 1 -QMATH_SONAME := 0 +QMATH_SONAME := GCCMATH_SONAME := GO_SONAME := 0 LIBC_DEP := libc6 diff -u gcc-4.7-4.7.2/debian/rules.defs gcc-4.7-4.7.2/debian/rules.defs --- gcc-4.7-4.7.2/debian/rules.defs +++ gcc-4.7-4.7.2/debian/rules.defs @@ -1021,7 +1021,7 @@ # run testsuite --------------- with_check := yes # if you don't want to run the gcc testsuite, uncomment the next line -#with_check := disabled by hand +with_check := disabled by plugwash ifeq ($(with_base_only),yes) with_check := no endif diff -u gcc-4.7-4.7.2/debian/rules2 gcc-4.7-4.7.2/debian/rules2 --- gcc-4.7-4.7.2/debian/rules2 +++ gcc-4.7-4.7.2/debian/rules2 @@ -350,9 +350,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else # armel ifeq ($(distribution),Debian) @@ -364,9 +364,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else with_arm_arch = armv5t # starting with quantal endif @@ -377,7 +377,7 @@ endif CONFARGS += --with-float=$(float_abi) ifeq ($(with_arm_thumb),yes) - CONFARGS += --with-mode=thumb + # CONFARGS += --with-mode=thumb endif endif only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/arch +++ gcc-4.7-4.7.2/arch @@ -0,0 +1 @@ +armhf only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0001_Drop_g___4_7_from_libstdc____dev_s_deps_and_make_it_Multi_Arch__same.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0001_Drop_g___4_7_from_libstdc____dev_s_deps_and_make_it_Multi_Arch__same.patch @@ -0,0 +1,24 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1340362828 -7200 +# Node ID 1e5dfe55b8ab7253abb315e40eabba1540683fae +# Parent c8c0986fabb0512e94884ce2077621c80c4efef8 +Drop g++-4.7 from libstdc++*-dev's deps and make it Multi-Arch: same +-- + debian/control.m4 | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/debian/control.m4 b/debian/control.m4 +--- a/debian/control.m4 ++++ b/debian/control.m4 +@@ -2131,7 +2131,9 @@ + Architecture: ifdef(`TARGET',`all',`any') + Section: ifdef(`TARGET',`devel',`libdevel') + Priority: ifdef(`TARGET',`extra',PRI(optional)) +-Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} ++ifdef(`MULTIARCH', `Multi-Arch: same ++')`'dnl ++Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} + ifdef(`TARGET',`',`dnl native + Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev + Suggests: libstdc++CXX_SO`'PV-doc only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0003_Use_sysroot_and_fix_header_path_when_building_cross_compilers.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0003_Use_sysroot_and_fix_header_path_when_building_cross_compilers.patch @@ -0,0 +1,62 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1338470897 -7200 +# Node ID 8fe3799a1bce4aaef6ac3a8f3d4c3591b49c3607 +# Parent 5dff12e8e256f6e23ba3eeb9391c598b89496b4c +Use sysroot and fix header path when building cross-compilers +-- + debian/rules.defs | 11 ++++++----- + debian/rules2 | 10 ++-------- + 2 files changed, 8 insertions(+), 13 deletions(-) + +diff --git a/debian/rules.defs b/debian/rules.defs +--- a/debian/rules.defs ++++ b/debian/rules.defs +@@ -123,14 +123,15 @@ + else + ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE)) + DEB_CROSS = yes +- else +- # first ones are squeeze+1 and maverick +- ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid)) +- with_sysroot = / +- endif + endif + endif + ++# first ones are squeeze+1 and maverick ++ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid)) ++ with_sysroot = / ++endif ++ ++ + # --------------------------------------------------------------------------- + # cross compiler support + ifeq ($(DEB_CROSS),yes) +diff --git a/debian/rules2 b/debian/rules2 +--- a/debian/rules2 ++++ b/debian/rules2 +@@ -498,13 +498,7 @@ + + ifeq ($(DEB_CROSS),yes) + CONFARGS += \ +- --program-prefix=$(TARGET_ALIAS)- \ +- --includedir=/$(PFL)/include +- ifndef DEB_STAGE +- CONFARGS += \ +- --with-headers=/$(PFL)/include \ +- --with-libs=/$(PFL)/lib +- endif ++ --program-prefix=$(TARGET_ALIAS)- + # FIXME: dpkg-shlibdeps doesn't work without this + SET_CROSS_LIB_PATH = LD_LIBRARY_PATH=/lib:/usr/lib:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib$${DIRNAME} + ifeq ($(DEB_TARGET_ARCH),armel) +@@ -755,7 +749,7 @@ + cxx_inc_dir = $(PF)/include/c++/$(GCC_VERSION) + endif + else +- cxx_inc_dir = $(PF)/$(TARGET_ALIAS)/include/c++/$(GCC_VERSION) ++ cxx_inc_dir = $(PF)/include/$(TARGET_ALIAS)/c++/$(GCC_VERSION) + endif + + default: build only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0007_Fix_a_useless_difference_between_cross_built_and_natively_built_libstdcxx.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0007_Fix_a_useless_difference_between_cross_built_and_natively_built_libstdcxx.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1339975317 -7200 +# Node ID 52c10bd6e1153f714dbc5b131d74c258a228f0c4 +# Parent 71cd6bfe3a1a17f9857ab4783fb375023c812602 +Fix a useless difference between cross-built and natively-built libstdcxx + +Some files were only included in the dbg packages if built natively. +However, cross-built runtime libs shouldn't differ from natively-built ones. +This patch unifies natively-built and cross-built libstdcxx debug packages +by shipping the files in both cases. +-- + debian/rules.d/binary-libstdcxx.mk | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk +--- a/debian/rules.d/binary-libstdcxx.mk ++++ b/debian/rules.d/binary-libstdcxx.mk +@@ -92,10 +92,8 @@ + files_dbg = \ + $(usr_lib)/debug/libstdc++.{a,so*} + +-ifneq ($(DEB_CROSS),yes) +- dirs_dbg += $(PF)/share/gcc-$(BASE_VERSION)/python +- files_dbg += $(PF)/share/gcc-$(BASE_VERSION)/python/libstdcxx +-endif ++dirs_dbg += $(PF)/share/gcc-$(BASE_VERSION)/python ++files_dbg += $(PF)/share/gcc-$(BASE_VERSION)/python/libstdcxx + + dirs_pic = \ + $(docdir) \ only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0006_Duplicate_gcc_4_7_base_into_gcc_4_7__triplet__base_when_building_cross_compilers_.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0006_Duplicate_gcc_4_7_base_into_gcc_4_7__triplet__base_when_building_cross_compilers_.patch @@ -0,0 +1,957 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1339946423 -7200 +# Node ID 71cd6bfe3a1a17f9857ab4783fb375023c812602 +# Parent 0a7ec24092d2cf5137136661e6de6b499d64e47e +Duplicate gcc-4.7-base into gcc-4.7--base when building cross-compilers. + +Most binary packages built from the gcc-4.7 source package use a symlink to +/usr/share/doc/gcc-4.7-base for their documentation, and ship a few files in there. +This means that if compilers and cross-compilers were to use the same gcc-4.7-base package, +they would provide the same files in the same path, leading to file conflicts. + +This patch makes it possible to generate both gcc-4.7-base:$TARGET and gcc-4.7--base +when building cross-compilers, which would depend on the latter. + +Some alternatives for cross-compilers would be: +* To depend on gcc-4.7-base:$TARGET (= $VER), symlink there and provide no doc. + This would be bad as one would have to install a native compiler to have docs. + While this is likely, this isn't a reasonable assumption. + Moreover, this would require version-sync between the cross-compiler and the runtime libs. +* The same thing, but with an additional dependency on the native compiler. + This would solve the docs problem, but add a cumbersome dependency, and wouldn't solve + the version-sync problem. +* Stop symlinking. This would solve the dependency problem as well as the version-sync one, + but it would require some files (like the copyright one) to be copied to each cross-compiler + package's doc. +-- + debian/control.m4 | 60 +++++++++++++++-------------- + debian/rules.d/binary-ada.mk | 6 +- + debian/rules.d/binary-base.mk | 78 +++++++++++++++++++++++-------------- + debian/rules.d/binary-cpp.mk | 8 +- + debian/rules.d/binary-cxx.mk | 20 ++++---- + debian/rules.d/binary-fixincl.mk | 6 +- + debian/rules.d/binary-fortran.mk | 16 +++--- + debian/rules.d/binary-gcc.mk | 42 ++++++++++---------- + debian/rules.d/binary-go.mk | 16 +++--- + debian/rules.d/binary-hppa64.mk | 2 +- + debian/rules.d/binary-nof.mk | 2 +- + debian/rules.d/binary-objc.mk | 10 ++-- + debian/rules.d/binary-objcxx.mk | 8 +- + debian/rules.d/binary-softfloat.mk | 2 +- + debian/rules.d/binary-spu.mk | 6 +- + debian/rules.defs | 1 + + debian/rules2 | 15 +++--- + 17 files changed, 160 insertions(+), 138 deletions(-) + +diff --git a/debian/control.m4 b/debian/control.m4 +--- a/debian/control.m4 ++++ b/debian/control.m4 +@@ -87,6 +87,10 @@ + define(`BASEDEP', `gcc`'PV-base (= ${gcc:Version})') + define(`SOFTBASEDEP', `gcc`'PV-base (>= ${gcc:SoftVersion})') + ++dnl default base package dependencies for cross-tools ++define(`TBASEDEP', `gcc`'PV-base (= ${gcc:Version})') ++define(`TSOFTBASEDEP', `gcc`'PV-base (>= ${gcc:SoftVersion})') ++ + dnl base, when building libgcc out of the gcj source; needed if new symbols + dnl in libgcc are used in libgcj. + ifelse(index(SRCNAME, `gcj'), 0, ` +@@ -94,11 +98,10 @@ + define(`SOFTBASEDEP', `gcj`'PV-base (>= ${gcj:SoftVersion})') + ') + +-ifdef(`TARGET', `', ` + ifenabled(`gccbase',` + + Package: gcc`'PV-base +-Architecture: any ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`MULTIARCH', `Multi-Arch: same + ')`'dnl + Section: libs +@@ -113,16 +116,15 @@ + . + 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 BASE_ONLY ++')`'dnl gccbase enabled + + ifenabled(`gccxbase',` + dnl override default base package dependencies to cross version + dnl This creates a toolchain that doesnt depend on the system -base packages + define(`BASETARGET', `PV`'TS') +-define(`BASEDEP', `gcc`'BASETARGET-base (= ${gcc:Version})') +-define(`SOFTBASEDEP', `gcc`'BASETARGET-base (>= ${gcc:SoftVersion})') ++define(`TBASEDEP', `gcc`'BASETARGET-base (= ${gcc:Version})') ++define(`TSOFTBASEDEP', `gcc`'BASETARGET-base (>= ${gcc:SoftVersion})') + + Package: gcc`'BASETARGET-base + Architecture: any +@@ -393,7 +395,7 @@ + Architecture: any + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} + Recommends: ${dep:libcdev} + Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'AQ (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'AQ, libgomp`'GOMP_SO-dbg`'AQ, libitm`'ITM_SO-dbg`'AQ, libquadmath`'QMATH_SO-dbg`'AQ, libmudflap`'MF_SO-dbg`'AQ, ${dep:libcloog}, ${dep:gold} + Provides: c-compiler`'TS +@@ -409,7 +411,7 @@ + Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${dep:libmudflapbiarch} + Description: GNU C compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU C compiler, a fairly portable optimizing compiler for C. +@@ -423,7 +425,7 @@ + Architecture: any + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), GMP_BUILD_DEP ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV`'TS (= ${gcc:Version}), GMP_BUILD_DEP ${shlibs:Depends}, ${misc:Depends} + Description: Files for GNU GCC plugin development. + This package contains (header) files for GNU GCC plugin development. It + is only used for the development of GCC plugins, but not needed to run +@@ -436,7 +438,7 @@ + Architecture: ifdef(`TARGET',`any',hppa) + Section: devel + Priority: PRI(optional) +-Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, ${shlibs:Depends}, ${misc:Depends} + Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3) + Description: GNU C compiler (cross compiler for hppa64) + This is the GNU C compiler, a fairly portable optimizing compiler for C. +@@ -446,7 +448,7 @@ + Architecture: powerpc ppc64 + Section: devel + Priority: PRI(optional) +-Depends: BASEDEP, binutils-spu (>= 2.18.1~cvs20080103-3), newlib-spu, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, binutils-spu (>= 2.18.1~cvs20080103-3), newlib-spu, ${shlibs:Depends}, ${misc:Depends} + Provides: spu-gcc + Description: SPU cross-compiler (preprocessor and C compiler) + GNU Compiler Collection for the Cell Broadband Engine SPU (preprocessor +@@ -456,7 +458,7 @@ + Architecture: powerpc ppc64 + Section: devel + Priority: PRI(optional) +-Depends: BASEDEP, gcc`'PV-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} + Provides: spu-g++ + Description: SPU cross-compiler (C++ compiler) + GNU Compiler Collection for the Cell Broadband Engine SPU (C++ compiler). +@@ -465,7 +467,7 @@ + Architecture: powerpc ppc64 + Section: devel + Priority: PRI(optional) +-Depends: BASEDEP, gcc`'PV-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} + Provides: spu-gfortran + Description: SPU cross-compiler (Fortran compiler) + GNU Compiler Collection for the Cell Broadband Engine SPU (Fortran compiler). +@@ -478,7 +480,7 @@ + Architecture: any + Section: ifdef(`TARGET',`devel',`interpreters') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, ${shlibs:Depends}, ${misc:Depends} + Suggests: gcc`'PV-locales (>= ${gcc:SoftVersion}) + Replaces: gcc-4.6 (<< 4.6.1-9) + Description: GNU C preprocessor +@@ -526,7 +528,7 @@ + Architecture: any + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'AQ (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'AQ (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} + Provides: c++-compiler`'TS`'ifdef(`TARGET',`',`, c++abi2-dev') + Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libstdc++CXX_SO`'PV-dbg`'AQ + Description: GNU C++ compiler`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') +@@ -541,7 +543,7 @@ + Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libcxxbiarch}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, g++`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libcxxbiarch}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${dep:libcxxbiarchdbg} + Description: GNU C++ compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. +@@ -1184,7 +1186,7 @@ + Package: gobjc++`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'OBJC_SO`'AQ (>= ${gcc:Version}), ${misc:Depends} ++Depends: TBASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'OBJC_SO`'AQ (>= ${gcc:Version}), ${misc:Depends} + Suggests: ${gobjcxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}) + Provides: objc++-compiler`'TS + Description: GNU Objective-C++ compiler +@@ -1198,7 +1200,7 @@ + Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gobjc++`'PV`'TS (= ${gcc:Version}), g++`'PV-multilib`'TS (= ${gcc:Version}), gobjc`'PV-multilib`'TS (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gobjc++`'PV`'TS (= ${gcc:Version}), g++`'PV-multilib`'TS (= ${gcc:Version}), gobjc`'PV-multilib`'TS (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} + Description: GNU Objective-C++ compiler (multilib files) + This is the GNU Objective-C++ compiler, which compiles Objective-C++ on + platforms supported by the gcc compiler. +@@ -1213,7 +1215,7 @@ + Package: gobjc`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'OBJC_SO`'AQ (>= ${gcc:Version}), ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'OBJC_SO`'AQ (>= ${gcc:Version}), ${misc:Depends} + Suggests: ${gobjc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libobjc`'OBJC_SO-dbg`'AQ + Provides: objc-compiler`'TS + ifdef(`__sparc__',`Conflicts: gcc`'PV-sparc64', `dnl') +@@ -1227,7 +1229,7 @@ + Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Objective-C compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU Objective-C compiler, which compiles Objective-C on platforms + supported by the gcc compiler. +@@ -1377,7 +1379,7 @@ + Package: gfortran`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libgfortran`'FORTRAN_SO`'AQ (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libgfortran`'FORTRAN_SO`'AQ (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} + Provides: fortran95-compiler + Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libgfortran`'FORTRAN_SO-dbg`'AQ + Replaces: libgfortran`'FORTRAN_SO-dev +@@ -1391,7 +1393,7 @@ + Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gfortran`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libgfortranbiarch}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gfortran`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libgfortranbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Fortran compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU Fortran compiler, which compiles Fortran on platforms + supported by the gcc compiler. +@@ -1567,7 +1569,7 @@ + Package: gccgo`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, ifdef(`STANDALONEGO',,`gcc`'PV`'TS (= ${gcc:Version}), ')libgo`'GO_SO`'AQ (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, ifdef(`STANDALONEGO',,`gcc`'PV`'TS (= ${gcc:Version}), ')libgo`'GO_SO`'AQ (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} + Provides: go-compiler + Suggests: ${go:multilib}, gccgo`'PV-doc, libgo`'GO_SO-dbg`'AQ + Description: GNU Go compiler +@@ -1579,7 +1581,7 @@ + Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gccgo`'PV`'TS (= ${gcc:Version}), ifdef(`STANDALONEGO',,`gcc`'PV-multilib`'TS (= ${gcc:Version}), ')${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gccgo`'PV`'TS (= ${gcc:Version}), ifdef(`STANDALONEGO',,`gcc`'PV-multilib`'TS (= ${gcc:Version}), ')${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${dep:libgobiarchdbg} + Description: GNU Go compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU Go compiler, which compiles Go on platforms supported +@@ -2335,7 +2337,7 @@ + Package: gdc`'PV + Architecture: any + Priority: PRI(optional) +-Depends: SOFTBASEDEP, g++`'PV (>= ${gcc:SoftVersion}), libphobos`'PHOBOS_V`'PV-dev (= ${gdc:Version}) [libphobos_no_archs], ${shlibs:Depends}, ${misc:Depends} ++Depends: TSOFTBASEDEP, g++`'PV (>= ${gcc:SoftVersion}), libphobos`'PHOBOS_V`'PV-dev (= ${gdc:Version}) [libphobos_no_archs], ${shlibs:Depends}, ${misc:Depends} + Provides: gdc, d-compiler, d-v2-compiler + Replaces: gdc (<< 4.4.6-5) + Description: GNU D compiler (version 2), based on the GCC backend +@@ -2374,7 +2376,7 @@ + Package: gcc`'PV-soft-float + Architecture: arm armel armhf + Priority: PRI(optional) +-Depends: BASEDEP, ifenabled(`cdev',`gcc`'PV (= ${gcc:Version}),') ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, ifenabled(`cdev',`gcc`'PV (= ${gcc:Version}),') ${shlibs:Depends}, ${misc:Depends} + Conflicts: gcc-4.4-soft-float, gcc-4.5-soft-float, gcc-4.6-soft-float + Description: GCC soft-floating-point gcc libraries (ARM) + These are versions of basic static libraries such as libgcc.a compiled +@@ -2386,7 +2388,7 @@ + Package: fixincludes + Architecture: any + Priority: PRI(optional) +-Depends: BASEDEP, gcc`'PV (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} ++Depends: TBASEDEP, gcc`'PV (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} + Description: Fix non-ANSI header files + FixIncludes was created to fix non-ANSI system header files. Many + system manufacturers supply proprietary headers that are not ANSI compliant. +@@ -2419,7 +2421,7 @@ + Package: gcc`'PV-nof + Architecture: powerpc + Priority: PRI(optional) +-Depends: BASEDEP, ${shlibs:Depends}ifenabled(`cdev',`, gcc`'PV (= ${gcc:Version})'), ${misc:Depends} ++Depends: TBASEDEP, ${shlibs:Depends}ifenabled(`cdev',`, gcc`'PV (= ${gcc:Version})'), ${misc:Depends} + Conflicts: gcc-3.2-nof + Description: GCC no-floating-point gcc libraries (powerpc) + These are versions of basic static libraries such as libgcc.a compiled +diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk +--- a/debian/rules.d/binary-ada.mk ++++ b/debian/rules.d/binary-ada.mk +@@ -30,7 +30,7 @@ + gnatls gnatmake gnatname gnatprep gnatxref gnathtml + + dirs_gnat = \ +- $(docdir)/$(p_base) \ ++ $(docdir)/$(p_xbase) \ + $(PF)/bin \ + $(PF)/share/man/man1 \ + $(gcc_lib_dir) \ +@@ -62,8 +62,8 @@ + endif + endif + ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION)) +- mkdir -p $(d_gbase)/$(docdir)/$(p_base) +- ln -sf ../$(p_gbase) $(d_gbase)/$(docdir)/$(p_base)/Ada ++ mkdir -p $(d_gbase)/$(docdir)/$(p_xbase) ++ ln -sf ../$(p_gbase) $(d_gbase)/$(docdir)/$(p_xbase)/Ada + endif + dh_installchangelogs -p$(p_gbase) src/gcc/ada/ChangeLog + dh_compress -p$(p_gbase) +diff --git a/debian/rules.d/binary-base.mk b/debian/rules.d/binary-base.mk +--- a/debian/rules.d/binary-base.mk ++++ b/debian/rules.d/binary-base.mk +@@ -11,42 +11,62 @@ + additional_links = + endif + +-$(binary_stamp)-base: $(install_dependencies) ++ ++# do_gcc_base d_base p_base ++define do_gcc_base + dh_testdir + dh_testroot +- rm -rf $(d_base) +- dh_installdirs -p$(p_base) \ ++ rm -rf $(1) ++ dh_installdirs -p$(2) \ + $(gcc_lexec_dir) + + ln -sf $(BASE_VERSION) \ +- $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir)) ++ $(1)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir)) + for link in $(additional_links); do \ + ln -sf $(BASE_VERSION) \ +- $(d_base)/$$(dirname $(gcc_lib_dir))/$$link; \ ++ $(1)/$$(dirname $(gcc_lib_dir))/$$link; \ + done +-ifneq ($(gcc_lib_dir),$(gcc_lexec_dir)) +- ln -sf $(BASE_VERSION) \ +- $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir)) +- for link in $(additional_links); do \ +- ln -sf $(BASE_VERSION) \ +- $(d_base)/$$(dirname $(gcc_lexec_dir))/$$link; \ +- done ++ ++ $(if $(filter $(gcc_lib_dir),$(gcc_lexec_dir)),, ++ ln -sf $(BASE_VERSION) \ ++ $(1)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir)) ++ for link in $(additional_links); do \ ++ ln -sf $(BASE_VERSION) \ ++ $(1)/$$(dirname $(gcc_lexec_dir))/$$link; \ ++ done ++ ) ++ ++ $(if $(filter yes,$(with_spu)), ++ mkdir -p $(d_base)/$(gcc_spu_lexec_dir) ++ mkdir -p $(d_base)/$(gcc_spu_lib_dir) ++ ln -sf $(BASE_VERSION) $(1)/$(spulibexecdir)/gcc/spu/$(GCC_VERSION) ++ ln -sf $(BASE_VERSION) $(1)/usr/spu/lib/gcc/spu/$(GCC_VERSION) ++ ) ++ ++ dh_installdocs -p$(2) debian/README.Debian.$(DEB_TARGET_ARCH) ++ rm -f $(d_base)/usr/share/doc/$(2)/README.Debian ++ dh_installchangelogs -p$(2) ++ dh_compress -p$(2) ++ dh_fixperms -p$(2) ++ ++ $(if $(filter yes,$(3)), ++ $(cross_gencontrol) dh_gencontrol -p$(2) -- -v$(DEB_VERSION) $(common_substvars) ++ , ++ dh_gencontrol -p$(2) -- -v$(DEB_VERSION) $(common_substvars) ++ ) ++ ++ dh_installdeb -p$(2) ++ dh_md5sums -p$(2) ++ dh_builddeb -p$(2) ++endef ++ ++ ++$(binary_stamp)-base: ++ifeq ($(with_gccbase),yes) ++ $(call do_gcc_base,$(d_base),$(p_base),yes) + endif ++ifeq ($(with_gccxbase),yes) ++ $(call do_gcc_base,$(d_xbase),$(p_xbase)) ++endif ++ touch $@ + +-ifeq ($(with_spu),yes) +- mkdir -p $(d_base)/$(gcc_spu_lexec_dir) +- mkdir -p $(d_base)/$(gcc_spu_lib_dir) +- ln -sf $(BASE_VERSION) $(d_base)/$(spulibexecdir)/gcc/spu/$(GCC_VERSION) +- ln -sf $(BASE_VERSION) $(d_base)/usr/spu/lib/gcc/spu/$(GCC_VERSION) +-endif +- +- dh_installdocs -p$(p_base) debian/README.Debian.$(DEB_TARGET_ARCH) +- rm -f $(d_base)/usr/share/doc/$(p_base)/README.Debian +- dh_installchangelogs -p$(p_base) +- dh_compress -p$(p_base) +- dh_fixperms -p$(p_base) +- dh_gencontrol -p$(p_base) -- -v$(DEB_VERSION) $(common_substvars) +- dh_installdeb -p$(p_base) +- dh_md5sums -p$(p_base) +- dh_builddeb -p$(p_base) +- touch $@ +diff --git a/debian/rules.d/binary-cpp.mk b/debian/rules.d/binary-cpp.mk +--- a/debian/rules.d/binary-cpp.mk ++++ b/debian/rules.d/binary-cpp.mk +@@ -44,7 +44,7 @@ + endif + endif + +- debian/dh_doclink -p$(p_cpp) $(p_base) ++ debian/dh_doclink -p$(p_cpp) $(p_xbase) + debian/dh_rmemptydirs -p$(p_cpp) + + dh_strip -p$(p_cpp) +@@ -66,14 +66,14 @@ + + rm -rf $(d_cppd) + dh_installdirs -p$(p_cppd) \ +- $(docdir)/$(p_base) \ ++ $(docdir)/$(p_xbase) \ + $(PF)/share/info + DH_COMPAT=2 dh_movefiles -p$(p_cppd) \ + $(PF)/share/info/cpp* + +- debian/dh_doclink -p$(p_cppd) $(p_base) ++ debian/dh_doclink -p$(p_cppd) $(p_xbase) + dh_installdocs -p$(p_cppd) html/cpp.html html/cppinternals.html +- rm -f $(d_cppd)/$(docdir)/$(p_base)/copyright ++ rm -f $(d_cppd)/$(docdir)/$(p_xbase)/copyright + debian/dh_rmemptydirs -p$(p_cppd) + + dh_compress -p$(p_cppd) +diff --git a/debian/rules.d/binary-cxx.mk b/debian/rules.d/binary-cxx.mk +--- a/debian/rules.d/binary-cxx.mk ++++ b/debian/rules.d/binary-cxx.mk +@@ -4,7 +4,7 @@ + arch_binaries := $(arch_binaries) cxx + + dirs_cxx = \ +- $(docdir)/$(p_base)/C++ \ ++ $(docdir)/$(p_xbase)/C++ \ + $(PF)/bin \ + $(PF)/share/info \ + $(gcc_lexec_dir) \ +@@ -51,23 +51,23 @@ + endif + endif + +- debian/dh_doclink -p$(p_cxx) $(p_base) +- cp -p debian/README.C++ $(d_cxx)/$(docdir)/$(p_base)/C++/ ++ debian/dh_doclink -p$(p_cxx) $(p_xbase) ++ cp -p debian/README.C++ $(d_cxx)/$(docdir)/$(p_xbase)/C++/ + cp -p $(srcdir)/gcc/cp/ChangeLog \ +- $(d_cxx)/$(docdir)/$(p_base)/C++/changelog ++ $(d_cxx)/$(docdir)/$(p_xbase)/C++/changelog + debian/dh_rmemptydirs -p$(p_cxx) + +- mkdir -p $(d_cxx)/$(docdir)/$(p_base)/test-summaries ++ mkdir -p $(d_cxx)/$(docdir)/$(p_xbase)/test-summaries + echo "TEST COMPARE BEGIN" + ifeq ($(with_check),yes) + cp -p $$(find $(builddir) -mindepth 3 -name '*.sum') \ +- $(d_cxx)/$(docdir)/$(p_base)/test-summaries/ ++ $(d_cxx)/$(docdir)/$(p_xbase)/test-summaries/ + ifeq (0,1) + cd $(builddir); \ +- for i in $(CURDIR)/$(d_cxx)/$(docdir)/$(p_base)/test-summaries/*.sum; do \ ++ for i in $(CURDIR)/$(d_cxx)/$(docdir)/$(p_xbase)/test-summaries/*.sum; do \ + b=$$(basename $$i); \ +- if [ -f /usr/share/doc/$(p_base)/test-summaries/$$b.gz ]; then \ +- zcat /usr/share/doc/$(p_base)/test-summaries/$$b.gz > /tmp/$$b; \ ++ if [ -f /usr/share/doc/$(p_xbase)/test-summaries/$$b.gz ]; then \ ++ zcat /usr/share/doc/$(p_xbase)/test-summaries/$$b.gz > /tmp/$$b; \ + if sh $(srcdir)/contrib/test_summary /tmp/$$b $$i; then \ + echo "$$b: OK"; \ + else \ +@@ -121,7 +121,7 @@ + $(foreach flavour,$(flavours), \ + $(call do_cxx,$(flavour))) + +- debian/dh_doclink -p$(p_cxx_m) $(p_base) ++ debian/dh_doclink -p$(p_cxx_m) $(p_xbase) + debian/dh_rmemptydirs -p$(p_cxx_m) + + dh_strip -p$(p_cxx_m) +diff --git a/debian/rules.d/binary-fixincl.mk b/debian/rules.d/binary-fixincl.mk +--- a/debian/rules.d/binary-fixincl.mk ++++ b/debian/rules.d/binary-fixincl.mk +@@ -4,7 +4,7 @@ + d_fix = debian/$(p_fix) + + dirs_fix = \ +- $(docdir)/$(p_base)/fixincludes \ ++ $(docdir)/$(p_xbase)/fixincludes \ + $(PF)/share/man/man1 \ + $(PF)/bin \ + $(gcc_lexec_dir) \ +@@ -29,12 +29,12 @@ + # > $(d_fix)/$(PF)/lib/fixincludes/fixinc.sh + # chmod 755 $(d_fix)/$(PF)/lib/fixincludes/fixinc.sh + $(IR) $(srcdir)/fixincludes/README \ +- $(d_fix)/$(docdir)/$(p_base)/fixincludes ++ $(d_fix)/$(docdir)/$(p_xbase)/fixincludes + sed -e 's,@LIBEXECDIR@,$(gcc_lexec_dir),g' debian/fixincludes.in \ + > $(d_fix)/$(PF)/bin/fixincludes + chmod 755 $(d_fix)/$(PF)/bin/fixincludes + +- debian/dh_doclink -p$(p_fix) $(p_base) ++ debian/dh_doclink -p$(p_fix) $(p_xbase) + dh_strip -p$(p_fix) + dh_compress -p$(p_fix) + dh_fixperms -p$(p_fix) +diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk +--- a/debian/rules.d/binary-fortran.mk ++++ b/debian/rules.d/binary-fortran.mk +@@ -39,7 +39,7 @@ + d_g95d = debian/$(p_g95d) + + dirs_g95 = \ +- $(docdir)/$(p_base)/fortran \ ++ $(docdir)/$(p_xbase)/fortran \ + $(PF)/bin \ + $(gcc_lexec_dir) \ + $(gcc_lib_dir) \ +@@ -143,10 +143,10 @@ + endif + endif + +- debian/dh_doclink -p$(p_g95) $(p_base) ++ debian/dh_doclink -p$(p_g95) $(p_xbase) + + cp -p $(srcdir)/gcc/fortran/ChangeLog \ +- $(d_g95)/$(docdir)/$(p_base)/fortran/changelog ++ $(d_g95)/$(docdir)/$(p_xbase)/fortran/changelog + debian/dh_rmemptydirs -p$(p_g95) + + dh_strip -p$(p_g95) +@@ -172,7 +172,7 @@ + $(foreach flavour,$(flavours), \ + $(call do_fortran_dev,$(flavour),$(p_g95_m))) + +- debian/dh_doclink -p$(p_g95_m) $(p_base) ++ debian/dh_doclink -p$(p_g95_m) $(p_xbase) + debian/dh_rmemptydirs -p$(p_g95_m) + dh_strip -p$(p_g95_m) + dh_compress -p$(p_g95_m) +@@ -193,16 +193,16 @@ + + rm -rf $(d_g95d) + dh_installdirs -p$(p_g95d) \ +- $(docdir)/$(p_base)/fortran \ ++ $(docdir)/$(p_xbase)/fortran \ + $(PF)/share/info + DH_COMPAT=2 dh_movefiles -p$(p_g95d) \ + $(PF)/share/info/gfortran* + +- debian/dh_doclink -p$(p_g95d) $(p_base) ++ debian/dh_doclink -p$(p_g95d) $(p_xbase) + ifneq ($(GFDL_INVARIANT_FREE),yes) + dh_installdocs -p$(p_g95d) +- rm -f $(d_g95d)/$(docdir)/$(p_base)/copyright +- cp -p html/gfortran.html $(d_g95d)/$(docdir)/$(p_base)/fortran/ ++ rm -f $(d_g95d)/$(docdir)/$(p_xbase)/copyright ++ cp -p html/gfortran.html $(d_g95d)/$(docdir)/$(p_xbase)/fortran/ + endif + + dh_compress -p$(p_g95d) +diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk +--- a/debian/rules.d/binary-gcc.mk ++++ b/debian/rules.d/binary-gcc.mk +@@ -21,7 +21,7 @@ + # but it becomes difficult to name all these files ... + + dirs_gcc = \ +- $(docdir)/$(p_base)/{gcc,libssp,gomp,itm,quadmath} \ ++ $(docdir)/$(p_xbase)/{gcc,libssp,gomp,itm,quadmath} \ + $(PF)/bin \ + $(gcc_lexec_dir) \ + $(gcc_lib_dir)/{include,include-fixed} \ +@@ -161,26 +161,26 @@ + ifeq ($(with_linaro_branch),yes) + if [ -f $(srcdir)/ChangeLog.linaro ]; then \ + cp -p $(srcdir)/ChangeLog.linaro \ +- $(d_gcc)/$(docdir)/$(p_base)/changelog.linaro; \ ++ $(d_gcc)/$(docdir)/$(p_xbase)/changelog.linaro; \ + fi + endif + ifeq ($(with_libssp),yes) + cp -p $(srcdir)/libssp/ChangeLog \ +- $(d_gcc)/$(docdir)/$(p_base)/libssp/changelog ++ $(d_gcc)/$(docdir)/$(p_xbase)/libssp/changelog + endif + ifeq ($(with_gomp),yes) + mv $(d)/$(usr_lib)/libgomp*.spec $(d_gcc)/$(gcc_lib_dir)/ + cp -p $(srcdir)/libgomp/ChangeLog \ +- $(d_gcc)/$(docdir)/$(p_base)/gomp/changelog ++ $(d_gcc)/$(docdir)/$(p_xbase)/gomp/changelog + endif + ifeq ($(with_itm),yes) + mv $(d)/$(usr_lib)/libitm*.spec $(d_gcc)/$(gcc_lib_dir)/ + cp -p $(srcdir)/libitm/ChangeLog \ +- $(d_gcc)/$(docdir)/$(p_base)/itm/changelog ++ $(d_gcc)/$(docdir)/$(p_xbase)/itm/changelog + endif + ifeq ($(with_qmath),yes) + cp -p $(srcdir)/libquadmath/ChangeLog \ +- $(d_gcc)/$(docdir)/$(p_base)/quadmath/changelog ++ $(d_gcc)/$(docdir)/$(p_xbase)/quadmath/changelog + endif + + DH_COMPAT=2 dh_movefiles -p$(p_gcc) $(files_gcc) +@@ -205,17 +205,17 @@ + endif + + # dh_installdebconf +- debian/dh_doclink -p$(p_gcc) $(p_base) +- cp -p $(usr_doc_files) $(d_gcc)/$(docdir)/$(p_base)/. ++ debian/dh_doclink -p$(p_gcc) $(p_xbase) ++ cp -p $(usr_doc_files) $(d_gcc)/$(docdir)/$(p_xbase)/. + if [ -f testsuite-comparision ]; then \ +- cp -p testsuite-comparision $(d_gcc)/$(docdir)/$(p_base)/. ; \ ++ cp -p testsuite-comparision $(d_gcc)/$(docdir)/$(p_xbase)/. ; \ + fi +- cp -p debian/README.ssp $(d_gcc)/$(docdir)/$(p_base)/ +- cp -p debian/NEWS.gcc $(d_gcc)/$(docdir)/$(p_base)/NEWS +- cp -p debian/NEWS.html $(d_gcc)/$(docdir)/$(p_base)/NEWS.html +- cp -p $(srcdir)/ChangeLog $(d_gcc)/$(docdir)/$(p_base)/changelog ++ cp -p debian/README.ssp $(d_gcc)/$(docdir)/$(p_xbase)/ ++ cp -p debian/NEWS.gcc $(d_gcc)/$(docdir)/$(p_xbase)/NEWS ++ cp -p debian/NEWS.html $(d_gcc)/$(docdir)/$(p_xbase)/NEWS.html ++ cp -p $(srcdir)/ChangeLog $(d_gcc)/$(docdir)/$(p_xbase)/changelog + cp -p $(srcdir)/gcc/ChangeLog \ +- $(d_gcc)/$(docdir)/$(p_base)/gcc/changelog ++ $(d_gcc)/$(docdir)/$(p_xbase)/gcc/changelog + if [ -f $(builddir)/gcc/.bad_compare ]; then \ + ( \ + echo "The comparision of the stage2 and stage3 object files shows differences."; \ +@@ -224,7 +224,7 @@ + echo "The following files differ:"; \ + echo ""; \ + cat $(builddir)/gcc/.bad_compare; \ +- ) > $(d_gcc)/$(docdir)/$(p_base)/BOOTSTRAP_COMPARISION_FAILURE; \ ++ ) > $(d_gcc)/$(docdir)/$(p_xbase)/BOOTSTRAP_COMPARISION_FAILURE; \ + else \ + true; \ + fi +@@ -259,7 +259,7 @@ + $(foreach flavour,$(flavours), \ + $(call do_gcc_libs,$(flavour),$(p_gcc_m))) + +- debian/dh_doclink -p$(p_gcc_m) $(p_base) ++ debian/dh_doclink -p$(p_gcc_m) $(p_xbase) + debian/dh_rmemptydirs -p$(p_gcc_m) + + mkdir -p $(d_gcc_m)/usr/share/lintian/overrides +@@ -303,7 +303,7 @@ + cp $(srcdir)/gcc/config/arm/arm-cores.def \ + $(d_pld)/$(gcc_lib_dir)/plugin/include/config/arm/ + +- debian/dh_doclink -p$(p_pld) $(p_base) ++ debian/dh_doclink -p$(p_pld) $(p_xbase) + debian/dh_rmemptydirs -p$(p_pld) + + dh_strip -p$(p_pld) +@@ -330,7 +330,7 @@ + $(PF)/share/locale/*/*/cpplib*.* \ + $(PF)/share/locale/*/*/gcc*.* + +- debian/dh_doclink -p$(p_loc) $(p_base) ++ debian/dh_doclink -p$(p_loc) $(p_xbase) + debian/dh_rmemptydirs -p$(p_loc) + + dh_compress -p$(p_loc) +@@ -351,7 +351,7 @@ + + rm -rf $(d_doc) + dh_installdirs -p$(p_doc) \ +- $(docdir)/$(p_base) \ ++ $(docdir)/$(p_xbase) \ + $(PF)/share/info + DH_COMPAT=2 dh_movefiles -p$(p_doc) \ + $(PF)/share/info/gcc* +@@ -366,7 +366,7 @@ + # cp -p $(buildlibdir)/libitm/libitm$(pkg_ver).info $(d_doc)/$(PF)/share/info/ + endif + +- debian/dh_doclink -p$(p_doc) $(p_base) ++ debian/dh_doclink -p$(p_doc) $(p_xbase) + dh_installdocs -p$(p_doc) html/gcc.html html/gccint.html + ifeq ($(with_gomp),yes) + cp -p html/libgomp.html $(d_doc)/usr/share/doc/$(p_doc)/ +@@ -374,7 +374,7 @@ + ifeq ($(with_itm),yes) + cp -p html/libitm.html $(d_doc)/usr/share/doc/$(p_doc)/ + endif +- rm -f $(d_doc)/$(docdir)/$(p_base)/copyright ++ rm -f $(d_doc)/$(docdir)/$(p_xbase)/copyright + debian/dh_rmemptydirs -p$(p_doc) + + dh_compress -p$(p_doc) +diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk +--- a/debian/rules.d/binary-go.mk ++++ b/debian/rules.d/binary-go.mk +@@ -32,7 +32,7 @@ + d_golib = debian/$(p_golib) + + dirs_go = \ +- $(docdir)/$(p_base)/go \ ++ $(docdir)/$(p_xbase)/go \ + $(PF)/bin \ + $(gcc_lexec_dir) \ + $(gcc_lib_dir) \ +@@ -215,10 +215,10 @@ + endif + endif + +- debian/dh_doclink -p$(p_go) $(p_base) ++ debian/dh_doclink -p$(p_go) $(p_xbase) + + # cp -p $(srcdir)/gcc/go/ChangeLog \ +-# $(d_go)/$(docdir)/$(p_base)/go/changelog ++# $(d_go)/$(docdir)/$(p_xbase)/go/changelog + debian/dh_rmemptydirs -p$(p_go) + + dh_strip -p$(p_go) +@@ -244,7 +244,7 @@ + $(foreach flavour,$(flavours), \ + $(call do_go_dev,$(flavour),$(p_go_m))) + +- debian/dh_doclink -p$(p_go_m) $(p_base) ++ debian/dh_doclink -p$(p_go_m) $(p_xbase) + debian/dh_rmemptydirs -p$(p_go_m) + dh_strip -p$(p_go_m) + dh_compress -p$(p_go_m) +@@ -265,16 +265,16 @@ + + rm -rf $(d_god) + dh_installdirs -p$(p_god) \ +- $(docdir)/$(p_base)/go \ ++ $(docdir)/$(p_xbase)/go \ + $(PF)/share/info + # DH_COMPAT=2 dh_movefiles -p$(p_god) \ + # $(PF)/share/info/gfortran* + +- debian/dh_doclink -p$(p_god) $(p_base) ++ debian/dh_doclink -p$(p_god) $(p_xbase) + ifneq ($(GFDL_INVARIANT_FREE),yes) + dh_installdocs -p$(p_god) +- rm -f $(d_god)/$(docdir)/$(p_base)/copyright +-# cp -p html/gccgo.html $(d_god)/$(docdir)/$(p_base)/go/ ++ rm -f $(d_god)/$(docdir)/$(p_xbase)/copyright ++# cp -p html/gccgo.html $(d_god)/$(docdir)/$(p_xbase)/go/ + endif + + dh_compress -p$(p_god) +diff --git a/debian/rules.d/binary-hppa64.mk b/debian/rules.d/binary-hppa64.mk +--- a/debian/rules.d/binary-hppa64.mk ++++ b/debian/rules.d/binary-hppa64.mk +@@ -14,7 +14,7 @@ + /usr/bin/hppa64-linux-gnu-ld \ + /$(hppa64libexecdir)/gcc/hppa64-linux-gnu/$(GCC_VERSION)/ld + +- debian/dh_doclink -p$(p_hppa64) $(p_base) ++ debian/dh_doclink -p$(p_hppa64) $(p_xbase) + debian/dh_rmemptydirs -p$(p_hppa64) + + dh_strip -p$(p_hppa64) -X.o -Xlibgcc.a -Xlibgcov.a +diff --git a/debian/rules.d/binary-nof.mk b/debian/rules.d/binary-nof.mk +--- a/debian/rules.d/binary-nof.mk ++++ b/debian/rules.d/binary-nof.mk +@@ -36,7 +36,7 @@ + rm -rf $(d_nof) + dh_installdirs -p$(p_nof) $(dirs_nof) + DH_COMPAT=2 dh_movefiles -p$(p_nof) $(files_nof) +- debian/dh_doclink -p$(p_nof) $(p_base) ++ debian/dh_doclink -p$(p_nof) $(p_xbase) + dh_strip -p$(p_nof) + dh_compress -p$(p_nof) + dh_fixperms -p$(p_nof) +diff --git a/debian/rules.d/binary-objc.mk b/debian/rules.d/binary-objc.mk +--- a/debian/rules.d/binary-objc.mk ++++ b/debian/rules.d/binary-objc.mk +@@ -10,7 +10,7 @@ + d_objc_m= debian/$(p_objc_m) + + dirs_objc = \ +- $(docdir)/$(p_base)/ObjC \ ++ $(docdir)/$(p_xbase)/ObjC \ + $(gcc_lexec_dir) \ + $(gcc_lib_dir)/include + +@@ -41,12 +41,12 @@ + $(call do_objc,,$(p_objc)) + + cp -p $(srcdir)/libobjc/{README*,THREADS*} \ +- $(d_objc)/$(docdir)/$(p_base)/ObjC/. ++ $(d_objc)/$(docdir)/$(p_xbase)/ObjC/. + + cp -p $(srcdir)/libobjc/ChangeLog \ +- $(d_objc)/$(docdir)/$(p_base)/ObjC/changelog.libobjc ++ $(d_objc)/$(docdir)/$(p_xbase)/ObjC/changelog.libobjc + +- debian/dh_doclink -p$(p_objc) $(p_base) ++ debian/dh_doclink -p$(p_objc) $(p_xbase) + + debian/dh_rmemptydirs -p$(p_objc) + +@@ -73,7 +73,7 @@ + $(foreach flavour,$(flavours), \ + $(call do_objc,$(flavour),$(p_objc_m))) + +- debian/dh_doclink -p$(p_objc_m) $(p_base) ++ debian/dh_doclink -p$(p_objc_m) $(p_xbase) + + dh_strip -p$(p_objc_m) + dh_compress -p$(p_objc_m) +diff --git a/debian/rules.d/binary-objcxx.mk b/debian/rules.d/binary-objcxx.mk +--- a/debian/rules.d/binary-objcxx.mk ++++ b/debian/rules.d/binary-objcxx.mk +@@ -10,7 +10,7 @@ + d_objcx_m = debian/$(p_objcx_m) + + dirs_objcx = \ +- $(docdir)/$(p_base)/Obj-C++ \ ++ $(docdir)/$(p_xbase)/Obj-C++ \ + $(gcc_lexec_dir) + + files_objcx = \ +@@ -25,9 +25,9 @@ + dh_installdirs -p$(p_objcx) $(dirs_objcx) + DH_COMPAT=2 dh_movefiles -p$(p_objcx) $(files_objcx) + +- debian/dh_doclink -p$(p_objcx) $(p_base) ++ debian/dh_doclink -p$(p_objcx) $(p_xbase) + cp -p $(srcdir)/gcc/objcp/ChangeLog \ +- $(d_objcx)/$(docdir)/$(p_base)/Obj-C++/changelog ++ $(d_objcx)/$(docdir)/$(p_xbase)/Obj-C++/changelog + + debian/dh_rmemptydirs -p$(p_objcx) + +@@ -50,7 +50,7 @@ + + rm -rf $(d_objcx_m) + +- debian/dh_doclink -p$(p_objcx_m) $(p_base) ++ debian/dh_doclink -p$(p_objcx_m) $(p_xbase) + debian/dh_rmemptydirs -p$(p_objcx_m) + dh_strip -p$(p_objcx_m) + dh_compress -p$(p_objcx_m) +diff --git a/debian/rules.d/binary-softfloat.mk b/debian/rules.d/binary-softfloat.mk +--- a/debian/rules.d/binary-softfloat.mk ++++ b/debian/rules.d/binary-softfloat.mk +@@ -23,7 +23,7 @@ + rm -rf $(d_softfloat)/$(PFL)/$(libdir)/soft-float/libssp.so* + mv $(d_softfloat)/$(PFL)/$(libdir)/soft-float/libssp.a \ + $(d_softfloat)/$(PFL)/$(libdir)/soft-float/libssp_nonshared.a +- debian/dh_doclink -p$(p_softfloat) $(p_base) ++ debian/dh_doclink -p$(p_softfloat) $(p_xbase) + dh_strip -p$(p_softfloat) -Xlibgcj.a + dh_compress -p$(p_softfloat) + dh_fixperms -p$(p_softfloat) +diff --git a/debian/rules.d/binary-spu.mk b/debian/rules.d/binary-spu.mk +--- a/debian/rules.d/binary-spu.mk ++++ b/debian/rules.d/binary-spu.mk +@@ -95,7 +95,7 @@ + dh_installdirs -p$(p_spugcc) $(dirs_spugcc) + DH_COMPAT=2 dh_movefiles --sourcedir=$(d_spu) -p$(p_spugcc) $(files_spugcc) + +- debian/dh_doclink -p$(p_spugcc) $(p_base) ++ debian/dh_doclink -p$(p_spugcc) $(p_xbase) + debian/dh_rmemptydirs -p$(p_spugcc) + + -dh_strip -p$(p_spugcc) -X.o -Xlibgcc.a -Xlibgcov.a +@@ -120,7 +120,7 @@ + + ln -sf $(BASE_VERSION) $(d_spucxx)/usr/spu/include/c++/$(GCC_VERSION) + +- debian/dh_doclink -p$(p_spucxx) $(p_base) ++ debian/dh_doclink -p$(p_spucxx) $(p_xbase) + debian/dh_rmemptydirs -p$(p_spucxx) + + -dh_strip -p$(p_spucxx) +@@ -145,7 +145,7 @@ + + DH_COMPAT=2 dh_movefiles --sourcedir=$(d_spu) -p$(p_spuf95) $(files_spuf95) + +- debian/dh_doclink -p$(p_spuf95) $(p_base) ++ debian/dh_doclink -p$(p_spuf95) $(p_xbase) + debian/dh_rmemptydirs -p$(p_spuf95) + + -dh_strip -p$(p_spuf95) +diff --git a/debian/rules.defs b/debian/rules.defs +--- a/debian/rules.defs ++++ b/debian/rules.defs +@@ -347,6 +347,7 @@ + ifneq ($(DEB_CROSS),yes) + with_gccbase := yes + else ++ with_gccbase := yes + with_gccxbase := yes + endif + endif +diff --git a/debian/rules2 b/debian/rules2 +--- a/debian/rules2 ++++ b/debian/rules2 +@@ -718,14 +718,10 @@ + endif + endif + +-ifneq ($(DEB_CROSS),yes) +- ifneq ($(single_package),yes) +- cxx_inc_dir = $(PF)/include/c++/$(BASE_VERSION) +- else +- cxx_inc_dir = $(PF)/include/c++/$(GCC_VERSION) +- endif ++ifneq ($(single_package),yes) ++ cxx_inc_dir = $(PF)/include/c++/$(BASE_VERSION) + else +- cxx_inc_dir = $(PF)/include/$(TARGET_ALIAS)/c++/$(GCC_VERSION) ++ cxx_inc_dir = $(PF)/include/c++/$(GCC_VERSION) + endif + + default: build +@@ -1530,6 +1526,7 @@ + + ifneq ($(DEB_CROSS),yes) + p_base = gcc$(pkg_ver)-base ++ p_xbase = gcc$(pkg_ver)-base + p_gcc = gcc$(pkg_ver) + p_cpp = cpp$(pkg_ver) + p_cppd = cpp$(pkg_ver)-doc +@@ -1538,7 +1535,8 @@ + p_lgcc = libgcc$(GCC_SONAME) + else + # only triggered if DEB_CROSS set +- p_base = gcc$(pkg_ver)$(cross_bin_arch)-base ++ p_base = gcc$(pkg_ver)-base ++ p_xbase = gcc$(pkg_ver)$(cross_bin_arch)-base + p_cpp = cpp$(pkg_ver)$(cross_bin_arch) + p_gcc = gcc$(pkg_ver)$(cross_bin_arch) + p_cxx = g++$(pkg_ver)$(cross_bin_arch) +@@ -1547,6 +1545,7 @@ + + d = debian/tmp + d_base = debian/$(p_base) ++d_xbase = debian/$(p_xbase) + d_gcc = debian/$(p_gcc) + d_cpp = debian/$(p_cpp) + d_cppd = debian/$(p_cppd) only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0008_Simplify_control_m4_by_making_TARGET_packages____any____packages_.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0008_Simplify_control_m4_by_making_TARGET_packages____any____packages_.patch @@ -0,0 +1,1036 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1340655863 -7200 +# Node ID 79c9d114a4e408947c11f4ad671ee1f7eeb20f34 +# Parent 52c10bd6e1153f714dbc5b131d74c258a228f0c4 +Simplify control.m4 by making TARGET packages “any” packages. + +When cross-compiling, dpkg-dev will complain that some Arch: any packages +haven't been created for $DEB_HOST_ARCH, but that's expected and not +an issue. IMHO, it is better to simplify the code and reduce the differences +between cross-compilers and native compilers, rather than trying to avoid +such warnings. +-- + debian/control.m4 | 226 +++++++++++++++++++++++++++--------------------------- + 1 files changed, 113 insertions(+), 113 deletions(-) + +diff --git a/debian/control.m4 b/debian/control.m4 +--- a/debian/control.m4 ++++ b/debian/control.m4 +@@ -101,7 +101,7 @@ + ifenabled(`gccbase',` + + Package: gcc`'PV-base +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + ')`'dnl + Section: libs +@@ -163,7 +163,7 @@ + + ifenabled(`libgcc',` + Package: libgcc1 +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: libs + Priority: required + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} +@@ -178,7 +178,7 @@ + special needs for some languages. + + Package: libgcc1-dbg +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: debug + Priority: extra + Depends: BASEDEP, libgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +@@ -189,7 +189,7 @@ + Debug symbols for the GCC support library. + + Package: libgcc2 +-Architecture: ifdef(`TARGET',`TARGET',`m68k') ++Architecture: m68k + Section: libs + Priority: required + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} +@@ -203,7 +203,7 @@ + special needs for some languages. + + Package: libgcc2-dbg +-Architecture: ifdef(`TARGET',`TARGET',`m68k') ++Architecture: m68k + Section: debug + Priority: extra + Depends: BASEDEP, libgcc2 (= ${gcc:Version}), ${misc:Depends} +@@ -214,7 +214,7 @@ + + ifenabled(`lib4gcc',` + Package: libgcc4 +-Architecture: ifdef(`TARGET',`TARGET',`hppa') ++Architecture: hppa + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -228,7 +228,7 @@ + special needs for some languages. + + Package: libgcc4-dbg +-Architecture: ifdef(`TARGET',`TARGET',`hppa') ++Architecture: hppa + ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Section: debug + Priority: extra +@@ -239,7 +239,7 @@ + + ifenabled(`lib64gcc',` + Package: lib64gcc1 +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -250,7 +250,7 @@ + special needs for some languages. + + Package: lib64gcc1-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib64gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +@@ -260,7 +260,7 @@ + + ifenabled(`lib32gcc',` + Package: lib32gcc1 +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: libs + Priority: extra + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -271,7 +271,7 @@ + special needs for some languages. + + Package: lib32gcc1-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +@@ -296,7 +296,7 @@ + + ifenabled(`libhfgcc',` + Package: libhfgcc1 +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -307,7 +307,7 @@ + special needs for some languages. + + Package: libhfgcc1-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libhfgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +@@ -318,7 +318,7 @@ + + ifenabled(`libsfgcc',` + Package: libsfgcc1 +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -329,7 +329,7 @@ + special needs for some languages. + + Package: libsfgcc1-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libsfgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +@@ -340,7 +340,7 @@ + + ifenabled(`libn32gcc',` + Package: libn32gcc1 +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -351,7 +351,7 @@ + special needs for some languages. + + Package: libn32gcc1-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: debug + Priority: extra + Depends: BASEDEP, libn32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +@@ -557,7 +557,7 @@ + ifenabled(`mudflap',` + ifenabled(`libmudf',` + Package: libmudflap`'MF_SO +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -571,7 +571,7 @@ + dereferencing operations. + + Package: libmudflap`'MF_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Provides: libmudflap'MF_SO`-dbg-armel [armel], libmudflap'MF_SO`-dbg-armhf [armhf] + Section: debug +@@ -582,7 +582,7 @@ + dereferencing operations. + + Package: lib32mudflap`'MF_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -593,7 +593,7 @@ + dereferencing operations. + + Package: lib32mudflap`'MF_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib32mudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} +@@ -602,7 +602,7 @@ + dereferencing operations. + + Package: lib64mudflap`'MF_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -612,7 +612,7 @@ + dereferencing operations. + + Package: lib64mudflap`'MF_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib64mudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} +@@ -621,7 +621,7 @@ + dereferencing operations. + + Package: libn32mudflap`'MF_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -631,7 +631,7 @@ + dereferencing operations. + + Package: libn32mudflap`'MF_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: debug + Priority: extra + Depends: BASEDEP, libn32mudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} +@@ -641,7 +641,7 @@ + + ifenabled(`libhfmudflap',` + Package: libhfmudflap`'MF_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: libs + Priority: PRI(optional) + Conflicts: libmudflap`'MF_SO`'-armhf [biarchhf_archs] +@@ -651,7 +651,7 @@ + dereferencing operations. + + Package: libhfmudflap`'MF_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libhfmudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} +@@ -663,7 +663,7 @@ + + ifenabled(`libsfmudflap',` + Package: libsfmudflap`'MF_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -673,7 +673,7 @@ + dereferencing operations. + + Package: libsfmudflap`'MF_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libsfmudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} +@@ -685,7 +685,7 @@ + ')`'dnl libmudf + + Package: libmudflap`'MF_SO`'PV-dev +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: libdevel + Priority: PRI(optional) + Depends: BASEDEP, libmudflap`'MF_SO (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} +@@ -772,7 +772,7 @@ + ifenabled(`libgomp',` + Package: libgomp`'GOMP_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -785,7 +785,7 @@ + in the GNU Compiler Collection. + + Package: libgomp`'GOMP_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: debug + Priority: extra + Depends: BASEDEP, libgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +@@ -797,7 +797,7 @@ + + Package: lib32gomp`'GOMP_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -806,7 +806,7 @@ + in the GNU Compiler Collection. + + Package: lib32gomp`'GOMP_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib32gomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +@@ -816,7 +816,7 @@ + + Package: lib64gomp`'GOMP_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (64bit) +@@ -824,7 +824,7 @@ + in the GNU Compiler Collection. + + Package: lib64gomp`'GOMP_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib64gomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +@@ -834,7 +834,7 @@ + + Package: libn32gomp`'GOMP_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (n32) +@@ -842,7 +842,7 @@ + in the GNU Compiler Collection. + + Package: libn32gomp`'GOMP_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: debug + Priority: extra + Depends: BASEDEP, libn32gomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +@@ -852,7 +852,7 @@ + ifenabled(`libhfgomp',` + Package: libhfgomp`'GOMP_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-armhf [biarchhf_archs] +@@ -861,7 +861,7 @@ + in the GNU Compiler Collection. + + Package: libhfgomp`'GOMP_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libhfgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +@@ -873,7 +873,7 @@ + ifenabled(`libsfgomp',` + Package: libsfgomp`'GOMP_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-armel [biarchsf_archs] +@@ -882,7 +882,7 @@ + in the GNU Compiler Collection. + + Package: libsfgomp`'GOMP_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libsfgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +@@ -909,7 +909,7 @@ + ifenabled(`libitm',` + Package: libitm`'ITM_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ')`'dnl +@@ -922,7 +922,7 @@ + accesses to shared memory by several threads. + + Package: libitm`'ITM_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: debug + Priority: extra + Depends: BASEDEP, libitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +@@ -935,7 +935,7 @@ + + Package: lib32itm`'ITM_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -945,7 +945,7 @@ + accesses to shared memory by several threads. + + Package: lib32itm`'ITM_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib32itm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +@@ -956,7 +956,7 @@ + + Package: lib64itm`'ITM_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (64bit) +@@ -965,7 +965,7 @@ + accesses to shared memory by several threads. + + Package: lib64itm`'ITM_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib64itm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +@@ -976,7 +976,7 @@ + + Package: libn32itm`'ITM_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (n32) +@@ -985,7 +985,7 @@ + accesses to shared memory by several threads. + + Package: libn32itm`'ITM_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: debug + Priority: extra + Depends: BASEDEP, libn32itm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +@@ -997,7 +997,7 @@ + ifenabled(`libhfitm',` + Package: libhfitm`'ITM_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libitm'ITM_SO`-armhf [biarchhf_archs] +@@ -1007,7 +1007,7 @@ + accesses to shared memory by several threads. + + Package: libhfitm`'ITM_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libhfitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1021,7 +1021,7 @@ + ifenabled(`libsfitm',` + Package: libsfitm`'ITM_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (soft float ABI) +@@ -1030,7 +1030,7 @@ + accesses to shared memory by several threads. + + Package: libsfitm`'ITM_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libsfitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1059,7 +1059,7 @@ + ifenabled(`libqmath',` + Package: libquadmath`'QMATH_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ')`'dnl +@@ -1071,7 +1071,7 @@ + targets the REAL(16) type in the GNU Fortran compiler. + + Package: libquadmath`'QMATH_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: debug + Priority: extra + Depends: BASEDEP, libquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1082,7 +1082,7 @@ + + Package: lib32quadmath`'QMATH_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1092,7 +1092,7 @@ + targets the REAL(16) type in the GNU Fortran compiler. + + Package: lib32quadmath`'QMATH_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib32quadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1102,7 +1102,7 @@ + + Package: lib64quadmath`'QMATH_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (64bit) +@@ -1111,7 +1111,7 @@ + targets the REAL(16) type in the GNU Fortran compiler. + + Package: lib64quadmath`'QMATH_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib64quadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1121,7 +1121,7 @@ + + Package: libn32quadmath`'QMATH_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (n32) +@@ -1130,7 +1130,7 @@ + targets the REAL(16) type in the GNU Fortran compiler. + + Package: libn32quadmath`'QMATH_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: debug + Priority: extra + Depends: BASEDEP, libn32quadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1141,7 +1141,7 @@ + ifenabled(`libhfqmath',` + Package: libhfquadmath`'QMATH_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (hard float ABI) +@@ -1150,7 +1150,7 @@ + targets the REAL(16) type in the GNU Fortran compiler. + + Package: libhfquadmath`'QMATH_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libhfquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1162,7 +1162,7 @@ + ifenabled(`libsfqmath',` + Package: libsfquadmath`'QMATH_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (soft float ABI) +@@ -1171,7 +1171,7 @@ + targets the REAL(16) type in the GNU Fortran compiler. + + Package: libsfquadmath`'QMATH_SO-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libsfquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +@@ -1242,7 +1242,7 @@ + ifenabled(`libobjc',` + Package: libobjc`'OBJC_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ifelse(OBJC_SO,`2',`Breaks: ${multiarch:breaks} +@@ -1255,7 +1255,7 @@ + + Package: libobjc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + ')`'dnl + Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf] +@@ -1268,7 +1268,7 @@ + ifenabled(`lib64objc',` + Package: lib64objc`'OBJC_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (64bit) +@@ -1276,7 +1276,7 @@ + + Package: lib64objc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: extra + Depends: BASEDEP, lib64objc`'OBJC_SO (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (64 bit debug symbols) +@@ -1286,7 +1286,7 @@ + ifenabled(`lib32objc',` + Package: lib32objc`'OBJC_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1295,7 +1295,7 @@ + + Package: lib32objc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: extra + Depends: BASEDEP, lib32objc`'OBJC_SO (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (32 bit debug symbols) +@@ -1305,7 +1305,7 @@ + ifenabled(`libn32objc',` + Package: libn32objc`'OBJC_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (n32) +@@ -1313,7 +1313,7 @@ + + Package: libn32objc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: extra + Depends: BASEDEP, libn32objc`'OBJC_SO (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (n32 debug symbols) +@@ -1323,7 +1323,7 @@ + ifenabled(`libhfobjc',` + Package: libhfobjc`'OBJC_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-armhf [biarchhf_archs] +@@ -1332,7 +1332,7 @@ + + Package: libhfobjc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: extra + Depends: BASEDEP, libhfobjc`'OBJC_SO (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-dbg-armhf [biarchhf_archs] +@@ -1343,7 +1343,7 @@ + ifenabled(`libsfobjc',` + Package: libsfobjc`'OBJC_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-armel [biarchsf_archs] +@@ -1352,7 +1352,7 @@ + + Package: libsfobjc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: extra + Depends: BASEDEP, libsfobjc`'OBJC_SO (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-dbg-armel [biarchsf_archs] +@@ -1416,7 +1416,7 @@ + ifenabled(`libgfortran',` + Package: libgfortran`'FORTRAN_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -1430,7 +1430,7 @@ + + Package: libgfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf] + Priority: extra +@@ -1443,7 +1443,7 @@ + ifenabled(`lib64gfortran',` + Package: lib64gfortran`'FORTRAN_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications (64bit) +@@ -1452,7 +1452,7 @@ + + Package: lib64gfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: extra + Depends: BASEDEP, lib64gfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (64bit debug symbols) +@@ -1463,7 +1463,7 @@ + ifenabled(`lib32gfortran',` + Package: lib32gfortran`'FORTRAN_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1473,7 +1473,7 @@ + + Package: lib32gfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: extra + Depends: BASEDEP, lib32gfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (32 bit debug symbols) +@@ -1484,7 +1484,7 @@ + ifenabled(`libn32gfortran',` + Package: libn32gfortran`'FORTRAN_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications (n32) +@@ -1493,7 +1493,7 @@ + + Package: libn32gfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: extra + Depends: BASEDEP, libn32gfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (n32 debug symbols) +@@ -1504,7 +1504,7 @@ + ifenabled(`libhfgfortran',` + Package: libhfgfortran`'FORTRAN_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-armhf [biarchhf_archs] +@@ -1514,7 +1514,7 @@ + + Package: libhfgfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Priority: extra + Depends: BASEDEP, libhfgfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-dbg-armhf [biarchhf_archs] +@@ -1526,7 +1526,7 @@ + ifenabled(`libsfgfortran',` + Package: libsfgfortran`'FORTRAN_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-armel [biarchsf_archs] +@@ -1536,7 +1536,7 @@ + + Package: libsfgfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Priority: extra + Depends: BASEDEP, libsfgfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-dbg-armel [biarchsf_archs] +@@ -1605,7 +1605,7 @@ + ifenabled(`libggo',` + Package: libgo`'GO_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ')`'dnl +@@ -1618,7 +1618,7 @@ + + Package: libgo`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf] + Priority: extra +@@ -1631,7 +1631,7 @@ + ifenabled(`lib64go',` + Package: lib64go`'GO_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications (64bit) +@@ -1640,7 +1640,7 @@ + + Package: lib64go`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Priority: extra + Depends: BASEDEP, lib64go`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (64bit debug symbols) +@@ -1651,7 +1651,7 @@ + ifenabled(`lib32go',` + Package: lib32go`'GO_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1661,7 +1661,7 @@ + + Package: lib32go`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Priority: extra + Depends: BASEDEP, lib32go`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (32 bit debug symbols) +@@ -1672,7 +1672,7 @@ + ifenabled(`libn32go',` + Package: libn32go`'GO_SO + Section: libs +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications (n32) +@@ -1681,7 +1681,7 @@ + + Package: libn32go`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Priority: extra + Depends: BASEDEP, libn32go`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (n32 debug symbols) +@@ -1892,7 +1892,7 @@ + ifenabled(`c++',` + ifenabled(`libcxx',` + Package: libstdc++CXX_SO +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: libs + Priority: PRI(important) + Depends: BASEDEP, ${dep:libc}, ${shlibs:Depends}, ${misc:Depends} +@@ -1913,7 +1913,7 @@ + + ifenabled(`lib32cxx',` + Package: lib32stdc++CXX_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: libs + Priority: extra + Depends: BASEDEP, lib32gcc1, ${shlibs:Depends}, ${misc:Depends} +@@ -1925,7 +1925,7 @@ + + ifenabled(`lib64cxx',` + Package: lib64stdc++CXX_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, lib64gcc1, ${misc:Depends} +@@ -1940,7 +1940,7 @@ + + ifenabled(`libn32cxx',` + Package: libn32stdc++CXX_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, libn32gcc1, ${misc:Depends} +@@ -1955,7 +1955,7 @@ + + ifenabled(`libhfcxx',` + Package: libhfstdc++CXX_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, libhfgcc1, ${misc:Depends} +@@ -1971,7 +1971,7 @@ + + ifenabled(`libsfcxx',` + Package: libsfstdc++CXX_SO +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: libs + Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, libsfgcc1, ${misc:Depends} +@@ -2001,7 +2001,7 @@ + + ifenabled(`c++dev',` + Package: libstdc++CXX_SO`'PV-dev +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: libdevel + Priority: PRI(optional) + ifdef(`MULTIARCH', `Multi-Arch: same +@@ -2019,7 +2019,7 @@ + in g++-3.0. + + Package: libstdc++CXX_SO`'PV-pic +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: libdevel + Priority: extra + Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), ${misc:Depends} +@@ -2030,7 +2030,7 @@ + Unless you are making one of those, you will not need this package. + + Package: libstdc++CXX_SO`'PV-dbg +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Section: debug + Priority: extra + Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), libgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +@@ -2043,7 +2043,7 @@ + debugging symbols. + + Package: lib32stdc++CXX_SO`'PV-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') ++Architecture: biarch32_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib32stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +@@ -2053,7 +2053,7 @@ + debugging symbols. + + Package: lib64stdc++CXX_SO`'PV-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') ++Architecture: biarch64_archs + Section: debug + Priority: extra + Depends: BASEDEP, lib64stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +@@ -2063,7 +2063,7 @@ + debugging symbols. + + Package: libn32stdc++CXX_SO`'PV-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') ++Architecture: biarchn32_archs + Section: debug + Priority: extra + Depends: BASEDEP, libn32stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +@@ -2074,7 +2074,7 @@ + + ifenabled(`libhfdbgcxx',` + Package: libhfstdc++CXX_SO`'PV-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') ++Architecture: biarchhf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libhfstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +@@ -2086,7 +2086,7 @@ + + ifenabled(`libsfdbgcxx',` + Package: libsfstdc++CXX_SO`'PV-dbg +-Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') ++Architecture: biarchsf_archs + Section: debug + Priority: extra + Depends: BASEDEP, libsfstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +@@ -2360,7 +2360,7 @@ + + Package: libphobos`'PHOBOS_V`'PV`'TS-dbg + Section: debug +-Architecture: ifdef(`TARGET',`TARGET',`any') ++Architecture: any + Priority: extra + Depends: gdc`'PV`'TS (= ${gdc:Version}), libphobos`'PHOBOS_V`'PV-dev (= ${gdc:Version}), ${misc:Depends} + Provides: libphobos`'PHOBOS_V`'TS-dbg only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0002_Use_cross_arch_deps_instead_of___LS__or___cross_lib_arch__suffixed_dependencies.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0002_Use_cross_arch_deps_instead_of___LS__or___cross_lib_arch__suffixed_dependencies.patch @@ -0,0 +1,2314 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1338467658 -7200 +# Node ID 5dff12e8e256f6e23ba3eeb9391c598b89496b4c +# Parent 1e5dfe55b8ab7253abb315e40eabba1540683fae +Use cross-arch deps instead of $(LS) or $(cross_lib_arch)-suffixed dependencies + +This patch replaces the “LS” (libary suffix) and “cross_lib_arch” variables +with a new variable “AQ” (Arch Qualifier), that is set to “:$TARGET” when +building a cross-compiler, and is empty otherwise. + +This does not change anything to how native compilers are built. +-- + debian/control.m4 | 652 +++++++++++++++++----------------- + debian/rules.conf | 86 ++-- + debian/rules.d/binary-fortran.mk | 5 +- + debian/rules.d/binary-go.mk | 5 +- + debian/rules.d/binary-libgcc.mk | 27 +- + debian/rules.d/binary-libgomp.mk | 3 - + debian/rules.d/binary-libitm.mk | 3 - + debian/rules.d/binary-libmudflap.mk | 5 +- + debian/rules.d/binary-libobjc.mk | 3 - + debian/rules.d/binary-libquadmath.mk | 3 - + debian/rules.d/binary-libstdcxx.mk | 34 +- + debian/rules.defs | 29 +- + debian/rules2 | 4 +- + 13 files changed, 402 insertions(+), 457 deletions(-) + +diff --git a/debian/control.m4 b/debian/control.m4 +--- a/debian/control.m4 ++++ b/debian/control.m4 +@@ -160,8 +160,8 @@ + ')`'dnl ada + + ifenabled(`libgcc',` +-Package: libgcc1`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libgcc1 ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',required) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} +@@ -180,11 +180,11 @@ + environment. + ')`'dnl + +-Package: libgcc1-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libgcc1-dbg ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra +-Depends: BASEDEP, libgcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} ++Depends: BASEDEP, libgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + ifdef(`TARGET',`',`dnl + ifdef(`MULTIARCH',`Multi-Arch: same + ')dnl +@@ -198,8 +198,8 @@ + environment. + ')`'dnl + +-Package: libgcc2`'LS +-Architecture: ifdef(`TARGET',`all',`m68k') ++Package: libgcc2 ++Architecture: ifdef(`TARGET',`TARGET',`m68k') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',required) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} +@@ -218,11 +218,11 @@ + environment. + ')`'dnl + +-Package: libgcc2-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`m68k') ++Package: libgcc2-dbg ++Architecture: ifdef(`TARGET',`TARGET',`m68k') + Section: debug + Priority: extra +-Depends: BASEDEP, libgcc2`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libgcc2 (= ${gcc:Version}), ${misc:Depends} + ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same + '))`'dnl + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') +@@ -235,8 +235,8 @@ + ')`'dnl libgcc + + ifenabled(`lib4gcc',` +-Package: libgcc4`'LS +-Architecture: ifdef(`TARGET',`all',`hppa') ++Package: libgcc4 ++Architecture: ifdef(`TARGET',`TARGET',`hppa') + ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -254,13 +254,13 @@ + environment. + ')`'dnl + +-Package: libgcc4-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`hppa') ++Package: libgcc4-dbg ++Architecture: ifdef(`TARGET',`TARGET',`hppa') + ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same + '))`'dnl + Section: debug + Priority: extra +-Depends: BASEDEP, libgcc4`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libgcc4 (= ${gcc:Version}), ${misc:Depends} + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') + Debug symbols for the GCC support library. + ifdef(`TARGET', `dnl +@@ -271,14 +271,14 @@ + ')`'dnl lib4gcc + + ifenabled(`lib64gcc',` +-Package: lib64gcc1`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64gcc1 ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} + ifdef(`TARGET',`Provides: lib64gcc1-TARGET-dcv1 + ',`')`'dnl +-Conflicts: libgcc`'GCC_SO`'LS (<= 1:3.3-0pre9) ++Conflicts: libgcc`'GCC_SO (<= 1:3.3-0pre9) + Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (64bit) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or +@@ -289,11 +289,11 @@ + environment. + ')`'dnl + +-Package: lib64gcc1-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64gcc1-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib64gcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} ++Depends: BASEDEP, lib64gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') + Debug symbols for the GCC support library. + ifdef(`TARGET', `dnl +@@ -304,8 +304,8 @@ + ')`'dnl lib64gcc + + ifenabled(`lib32gcc',` +-Package: lib32gcc1`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32gcc1 ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: extra + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -322,11 +322,11 @@ + environment. + ')`'dnl + +-Package: lib32gcc1-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32gcc1-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib32gcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} ++Depends: BASEDEP, lib32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') + Debug symbols for the GCC support library. + ifdef(`TARGET', `dnl +@@ -337,11 +337,11 @@ + ')`'dnl lib32gcc1 + + ifenabled(`libneongcc',` +-Package: libgcc1-neon`'LS ++Package: libgcc1-neon + Architecture: NEON_ARCHS + Section: libs + Priority: extra +-Depends: BASEDEP, libc6-neon`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libc6-neon`'AQ, ${shlibs:Depends}, ${misc:Depends} + Description: GCC support library [neon optimized] + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or +@@ -352,8 +352,8 @@ + ')`'dnl libneongcc1 + + ifenabled(`libhfgcc',` +-Package: libhfgcc1`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfgcc1 ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -370,11 +370,11 @@ + environment. + ')`'dnl + +-Package: libhfgcc1-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfgcc1-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libhfgcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} ++Depends: BASEDEP, libhfgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Conflicts: libgcc1-dbg-armhf [biarchhf_archs] + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') + Debug symbols for the GCC support library. +@@ -386,8 +386,8 @@ + ')`'dnl libhfgcc + + ifenabled(`libsfgcc',` +-Package: libsfgcc1`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfgcc1 ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +@@ -404,11 +404,11 @@ + environment. + ')`'dnl + +-Package: libsfgcc1-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfgcc1-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libsfgcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} ++Depends: BASEDEP, libsfgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Conflicts: libgcc1-dbg-armel [biarchsf_archs] + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') + Debug symbols for the GCC support library. +@@ -420,14 +420,14 @@ + ')`'dnl libsfgcc + + ifenabled(`libn32gcc',` +-Package: libn32gcc1`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32gcc1 ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} + ifdef(`TARGET',`Provides: libn32gcc1-TARGET-dcv1 + ',`')`'dnl +-Conflicts: libgcc`'GCC_SO`'LS (<= 1:3.3-0pre9) ++Conflicts: libgcc`'GCC_SO (<= 1:3.3-0pre9) + Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (n32) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or +@@ -438,11 +438,11 @@ + environment. + ')`'dnl + +-Package: libn32gcc1-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32gcc1-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libn32gcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} ++Depends: BASEDEP, libn32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') + Debug symbols for the GCC support library. + ifdef(`TARGET', `dnl +@@ -454,7 +454,7 @@ + + ifdef(`TARGET', `', ` + ifenabled(`libgmath',` +-Package: libgccmath`'GCCMATH_SO`'LS ++Package: libgccmath`'GCCMATH_SO + Architecture: i386 + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +@@ -465,7 +465,7 @@ + Description: GCC math support library + Support library for GCC. + +-Package: lib32gccmath`'GCCMATH_SO`'LS ++Package: lib32gccmath`'GCCMATH_SO + Architecture: amd64 + Section: libs + Priority: PRI(optional) +@@ -473,7 +473,7 @@ + Description: GCC math support library (32bit) + Support library for GCC. + +-Package: lib64gccmath`'GCCMATH_SO`'LS ++Package: lib64gccmath`'GCCMATH_SO + Architecture: i386 + Section: libs + Priority: PRI(optional) +@@ -490,7 +490,7 @@ + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} + Recommends: ${dep:libcdev} +-Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'LS (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'LS, libgomp`'GOMP_SO-dbg`'LS, libitm`'ITM_SO-dbg`'LS, libquadmath`'QMATH_SO-dbg`'LS, libmudflap`'MF_SO-dbg`'LS, ${dep:libcloog}, ${dep:gold} ++Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'AQ (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'AQ, libgomp`'GOMP_SO-dbg`'AQ, libitm`'ITM_SO-dbg`'AQ, libquadmath`'QMATH_SO-dbg`'AQ, libmudflap`'MF_SO-dbg`'AQ, ${dep:libcloog}, ${dep:gold} + Provides: c-compiler`'TS + Description: GNU C compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') + This is the GNU C compiler, a fairly portable optimizing compiler for C. +@@ -621,9 +621,9 @@ + Architecture: any + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'AQ (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} + Provides: c++-compiler`'TS`'ifdef(`TARGET)',`',`, c++abi2-dev') +-Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libstdc++CXX_SO`'PV-dbg`'LS ++Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libstdc++CXX_SO`'PV-dbg`'AQ + Description: GNU C++ compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + ifdef(`TARGET', `dnl +@@ -649,8 +649,8 @@ + + ifenabled(`mudflap',` + ifenabled(`libmudf',` +-Package: libmudflap`'MF_SO`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libmudflap`'MF_SO ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -662,19 +662,19 @@ + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: libmudflap`'MF_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libmudflap`'MF_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + ')`Provides: libmudflap'MF_SO`-dbg-armel [armel], libmudflap'MF_SO`-dbg-armhf [armhf]') + Section: debug + Priority: extra +-Depends: BASEDEP, libmudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libmudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC mudflap shared support libraries (debug symbols) + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: lib32mudflap`'MF_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32mudflap`'MF_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -684,17 +684,17 @@ + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: lib32mudflap`'MF_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32mudflap`'MF_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib32mudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib32mudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC mudflap shared support libraries (32 bit debug symbols) + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: lib64mudflap`'MF_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64mudflap`'MF_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -703,17 +703,17 @@ + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: lib64mudflap`'MF_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64mudflap`'MF_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib64mudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib64mudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC mudflap shared support libraries (64 bit debug symbols) + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: libn32mudflap`'MF_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32mudflap`'MF_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -722,18 +722,18 @@ + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: libn32mudflap`'MF_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32mudflap`'MF_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libn32mudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libn32mudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC mudflap shared support libraries (n32 debug symbols) + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + + ifenabled(`libhfmudflap',` +-Package: libhfmudflap`'MF_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfmudflap`'MF_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Conflicts: libmudflap`'MF_SO`'-armhf [biarchhf_archs] +@@ -742,11 +742,11 @@ + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: libhfmudflap`'MF_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfmudflap`'MF_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libhfmudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libhfmudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libmudflap`'MF_SO`'-dbg-armhf [biarchhf_archs] + Description: GCC mudflap shared support libraries (hard float debug symbols) + The libmudflap libraries are used by GCC for instrumenting pointer and array +@@ -754,8 +754,8 @@ + ')`'dnl libhfmudflap + + ifenabled(`libsfmudflap',` +-Package: libsfmudflap`'MF_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfmudflap`'MF_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} +@@ -764,11 +764,11 @@ + The libmudflap libraries are used by GCC for instrumenting pointer and array + dereferencing operations. + +-Package: libsfmudflap`'MF_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfmudflap`'MF_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libsfmudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libsfmudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libmudflap`'MF_SO`'-dbg-armel [biarchsf_archs] + Description: GCC mudflap shared support libraries (soft float debug symbols) + The libmudflap libraries are used by GCC for instrumenting pointer and array +@@ -776,11 +776,11 @@ + ')`'dnl libsfmudflap + ')`'dnl libmudf + +-Package: libmudflap`'MF_SO`'PV-dev`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libmudflap`'MF_SO`'PV-dev ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: ifdef(`TARGET',`devel',`libdevel') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, libmudflap`'MF_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libmudflap`'MF_SO (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${sug:libmudflapdev} + Conflicts: libmudflap0-dev + Description: GCC mudflap support libraries (development files) +@@ -792,7 +792,7 @@ + + ifdef(`TARGET', `', ` + ifenabled(`ssp',` +-Package: libssp`'SSP_SO`'LS ++Package: libssp`'SSP_SO + Architecture: any + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +@@ -805,7 +805,7 @@ + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +-Package: lib32ssp`'SSP_SO`'LS ++Package: lib32ssp`'SSP_SO + Architecture: biarch32_archs + Section: libs + Priority: PRI(optional) +@@ -817,7 +817,7 @@ + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +-Package: lib64ssp`'SSP_SO`'LS ++Package: lib64ssp`'SSP_SO + Architecture: biarch64_archs + Section: libs + Priority: PRI(optional) +@@ -828,7 +828,7 @@ + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +-Package: libn32ssp`'SSP_SO`'LS ++Package: libn32ssp`'SSP_SO + Architecture: biarchn32_archs + Section: libs + Priority: PRI(optional) +@@ -839,7 +839,7 @@ + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +-Package: libhfssp`'SSP_SO`'LS ++Package: libhfssp`'SSP_SO + Architecture: biarchhf_archs + Section: libs + Priority: PRI(optional) +@@ -849,7 +849,7 @@ + The protection is realized by buffer overflow detection and reordering of + stack variables to avoid pointer corruption. + +-Package: libsfssp`'SSP_SO`'LS ++Package: libsfssp`'SSP_SO + Architecture: biarchsf_archs + Section: libs + Priority: PRI(optional) +@@ -862,9 +862,9 @@ + ')`'dnl native + + ifenabled(`libgomp',` +-Package: libgomp`'GOMP_SO`'LS ++Package: libgomp`'GOMP_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -875,20 +875,20 @@ + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: libgomp`'GOMP_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libgomp`'GOMP_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra +-Depends: BASEDEP, libgomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + ')`Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf]') + Description: GCC OpenMP (GOMP) support library (debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: lib32gomp`'GOMP_SO`'LS ++Package: lib32gomp`'GOMP_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -896,54 +896,54 @@ + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: lib32gomp`'GOMP_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32gomp`'GOMP_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib32gomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib32gomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (32 bit debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: lib64gomp`'GOMP_SO`'LS ++Package: lib64gomp`'GOMP_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (64bit) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: lib64gomp`'GOMP_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64gomp`'GOMP_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib64gomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib64gomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (64bit debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: libn32gomp`'GOMP_SO`'LS ++Package: libn32gomp`'GOMP_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (n32) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: libn32gomp`'GOMP_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32gomp`'GOMP_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libn32gomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libn32gomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (n32 debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + + ifenabled(`libhfgomp',` +-Package: libhfgomp`'GOMP_SO`'LS ++Package: libhfgomp`'GOMP_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-armhf [biarchhf_archs] +@@ -951,20 +951,20 @@ + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: libhfgomp`'GOMP_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfgomp`'GOMP_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libhfgomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libhfgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-dbg-armhf [biarchhf_archs] + Description: GCC OpenMP (GOMP) support library (hard float ABI debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + ')`'dnl libhfgomp + + ifenabled(`libsfgomp',` +-Package: libsfgomp`'GOMP_SO`'LS ++Package: libsfgomp`'GOMP_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-armel [biarchsf_archs] +@@ -972,22 +972,22 @@ + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + +-Package: libsfgomp`'GOMP_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfgomp`'GOMP_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libsfgomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libsfgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-dbg-armel [biarchsf_archs] + Description: GCC OpenMP (GOMP) support library (soft float ABI debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + ')`'dnl libsfgomp + + ifenabled(`libneongomp',` +-Package: libgomp`'GOMP_SO-neon`'LS ++Package: libgomp`'GOMP_SO-neon + Architecture: NEON_ARCHS + Section: libs + Priority: extra +-Depends: BASEDEP, libc6-neon`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libc6-neon`'AQ, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library [neon optimized] + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. +@@ -998,9 +998,9 @@ + ')`'dnl libgomp + + ifenabled(`libitm',` +-Package: libitm`'ITM_SO`'LS ++Package: libitm`'ITM_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]') +@@ -1011,11 +1011,11 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: libitm`'ITM_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libitm`'ITM_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra +-Depends: BASEDEP, libitm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + ')`Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf]') + Description: GNU Transactional Memory Library (debug symbols) +@@ -1023,9 +1023,9 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: lib32itm`'ITM_SO`'LS ++Package: lib32itm`'ITM_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1034,19 +1034,19 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: lib32itm`'ITM_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32itm`'ITM_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib32itm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib32itm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} + Description: GNU Transactional Memory Library (32 bit debug symbols) + GNU Transactional Memory Library (libitm) provides transaction support for + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: lib64itm`'ITM_SO`'LS ++Package: lib64itm`'ITM_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (64bit) +@@ -1054,19 +1054,19 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: lib64itm`'ITM_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64itm`'ITM_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib64itm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib64itm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} + Description: GNU Transactional Memory Library (64bit debug symbols) + GNU Transactional Memory Library (libitm) provides transaction support for + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: libn32itm`'ITM_SO`'LS ++Package: libn32itm`'ITM_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (n32) +@@ -1074,20 +1074,20 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: libn32itm`'ITM_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32itm`'ITM_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libn32itm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libn32itm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} + Description: GNU Transactional Memory Library (n32 debug symbols) + GNU Transactional Memory Library (libitm) provides transaction support for + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + + ifenabled(`libhfitm',` +-Package: libhfitm`'ITM_SO`'LS ++Package: libhfitm`'ITM_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libitm'ITM_SO`-armhf [biarchhf_archs] +@@ -1096,11 +1096,11 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: libhfitm`'ITM_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfitm`'ITM_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libhfitm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libhfitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libitm'ITM_SO`-armel [biarchsf_archs] + Description: GNU Transactional Memory Library (hard float ABI debug symbols) + GNU Transactional Memory Library (libitm) provides transaction support for +@@ -1109,9 +1109,9 @@ + ')`'dnl libhfitm + + ifenabled(`libsfitm',` +-Package: libsfitm`'ITM_SO`'LS ++Package: libsfitm`'ITM_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (soft float ABI) +@@ -1119,11 +1119,11 @@ + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + +-Package: libsfitm`'ITM_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfitm`'ITM_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libsfitm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libsfitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} + Description: GNU Transactional Memory Library (soft float ABI debug symbols) + GNU Transactional Memory Library (libitm) provides transaction support for + accesses to the memory of a process, enabling easy-to-use synchronization of +@@ -1131,11 +1131,11 @@ + ')`'dnl libsfitm + + ifenabled(`libneonitm',` +-Package: libitm`'ITM_SO-neon`'LS ++Package: libitm`'ITM_SO-neon + Architecture: NEON_ARCHS + Section: libs + Priority: extra +-Depends: BASEDEP, libc6-neon`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libc6-neon`'AQ, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library [neon optimized] + GNU Transactional Memory Library (libitm) provides transaction support for + accesses to the memory of a process, enabling easy-to-use synchronization of +@@ -1147,9 +1147,9 @@ + ')`'dnl libitm + + ifenabled(`libqmath',` +-Package: libquadmath`'QMATH_SO`'LS ++Package: libquadmath`'QMATH_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + '))`'dnl +@@ -1160,20 +1160,20 @@ + supporting the __float128 datatype. The library is used to provide on such + targets the REAL(16) type in the GNU Fortran compiler. + +-Package: libquadmath`'QMATH_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libquadmath`'QMATH_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra +-Depends: BASEDEP, libquadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + '))`'dnl + Description: GCC Quad-Precision Math Library (debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. + +-Package: lib32quadmath`'QMATH_SO`'LS ++Package: lib32quadmath`'QMATH_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1182,18 +1182,18 @@ + supporting the __float128 datatype. The library is used to provide on such + targets the REAL(16) type in the GNU Fortran compiler. + +-Package: lib32quadmath`'QMATH_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32quadmath`'QMATH_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib32quadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib32quadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC Quad-Precision Math Library (32 bit debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. + +-Package: lib64quadmath`'QMATH_SO`'LS ++Package: lib64quadmath`'QMATH_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (64bit) +@@ -1201,18 +1201,18 @@ + supporting the __float128 datatype. The library is used to provide on such + targets the REAL(16) type in the GNU Fortran compiler. + +-Package: lib64quadmath`'QMATH_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64quadmath`'QMATH_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib64quadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib64quadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC Quad-Precision Math Library (64bit debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. + +-Package: libn32quadmath`'QMATH_SO`'LS ++Package: libn32quadmath`'QMATH_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (n32) +@@ -1220,19 +1220,19 @@ + supporting the __float128 datatype. The library is used to provide on such + targets the REAL(16) type in the GNU Fortran compiler. + +-Package: libn32quadmath`'QMATH_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32quadmath`'QMATH_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libn32quadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libn32quadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC Quad-Precision Math Library (n32 debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. + + ifenabled(`libhfqmath',` +-Package: libhfquadmath`'QMATH_SO`'LS ++Package: libhfquadmath`'QMATH_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (hard float ABI) +@@ -1240,20 +1240,20 @@ + supporting the __float128 datatype. The library is used to provide on such + targets the REAL(16) type in the GNU Fortran compiler. + +-Package: libhfquadmath`'QMATH_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfquadmath`'QMATH_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libhfquadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libhfquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC Quad-Precision Math Library (hard float ABI debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. + ')`'dnl libhfqmath + + ifenabled(`libsfqmath',` +-Package: libsfquadmath`'QMATH_SO`'LS ++Package: libsfquadmath`'QMATH_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (soft float ABI) +@@ -1261,11 +1261,11 @@ + supporting the __float128 datatype. The library is used to provide on such + targets the REAL(16) type in the GNU Fortran compiler. + +-Package: libsfquadmath`'QMATH_SO-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfquadmath`'QMATH_SO-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libsfquadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libsfquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} + Description: GCC Quad-Precision Math Library (hard float ABI debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. +@@ -1277,7 +1277,7 @@ + Package: gobjc++`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'OBJC_SO`'AQ (>= ${gcc:Version}), ${misc:Depends} + Suggests: ${gobjcxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}) + Provides: objc++-compiler`'TS + Description: GNU Objective-C++ compiler +@@ -1306,8 +1306,8 @@ + Package: gobjc`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${misc:Depends} +-Suggests: ${gobjc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libobjc`'OBJC_SO-dbg`'LS ++Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'OBJC_SO`'AQ (>= ${gcc:Version}), ${misc:Depends} ++Suggests: ${gobjc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libobjc`'OBJC_SO-dbg`'AQ + Provides: objc-compiler`'TS + ifdef(`__sparc__',`Conflicts: gcc`'PV-sparc64', `dnl') + Description: GNU Objective-C compiler +@@ -1331,9 +1331,9 @@ + ')`'dnl objcdev + + ifenabled(`libobjc',` +-Package: libobjc`'OBJC_SO`'LS ++Package: libobjc`'OBJC_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ifelse(OBJC_SO,`2',`Breaks: ${multiarch:breaks} +@@ -1343,118 +1343,118 @@ + Description: Runtime library for GNU Objective-C applications + Library needed for GNU ObjC applications linked against the shared library. + +-Package: libobjc`'OBJC_SO-dbg`'LS ++Package: libobjc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + ')`Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf]') + Priority: extra +-Depends: BASEDEP, libobjc`'OBJC_SO`'LS (= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS, ${misc:Depends} ++Depends: BASEDEP, libobjc`'OBJC_SO (= ${gcc:Version}), libgcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (debug symbols) + Library needed for GNU ObjC applications linked against the shared library. + ')`'dnl libobjc + + ifenabled(`lib64objc',` +-Package: lib64objc`'OBJC_SO`'LS ++Package: lib64objc`'OBJC_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (64bit) + Library needed for GNU ObjC applications linked against the shared library. + +-Package: lib64objc`'OBJC_SO-dbg`'LS ++Package: lib64objc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: extra +-Depends: BASEDEP, lib64objc`'OBJC_SO`'LS (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg`'LS, ${misc:Depends} ++Depends: BASEDEP, lib64objc`'OBJC_SO (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (64 bit debug symbols) + Library needed for GNU ObjC applications linked against the shared library. + ')`'dnl lib64objc + + ifenabled(`lib32objc',` +-Package: lib32objc`'OBJC_SO`'LS ++Package: lib32objc`'OBJC_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: Runtime library for GNU Objective-C applications (32bit) + Library needed for GNU ObjC applications linked against the shared library. + +-Package: lib32objc`'OBJC_SO-dbg`'LS ++Package: lib32objc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: extra +-Depends: BASEDEP, lib32objc`'OBJC_SO`'LS (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg`'LS, ${misc:Depends} ++Depends: BASEDEP, lib32objc`'OBJC_SO (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (32 bit debug symbols) + Library needed for GNU ObjC applications linked against the shared library. + ')`'dnl lib32objc + + ifenabled(`libn32objc',` +-Package: libn32objc`'OBJC_SO`'LS ++Package: libn32objc`'OBJC_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (n32) + Library needed for GNU ObjC applications linked against the shared library. + +-Package: libn32objc`'OBJC_SO-dbg`'LS ++Package: libn32objc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: extra +-Depends: BASEDEP, libn32objc`'OBJC_SO`'LS (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg`'LS, ${misc:Depends} ++Depends: BASEDEP, libn32objc`'OBJC_SO (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (n32 debug symbols) + Library needed for GNU ObjC applications linked against the shared library. + ')`'dnl libn32objc + + ifenabled(`libhfobjc',` +-Package: libhfobjc`'OBJC_SO`'LS ++Package: libhfobjc`'OBJC_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-armhf [biarchhf_archs] + Description: Runtime library for GNU Objective-C applications (hard float ABI) + Library needed for GNU ObjC applications linked against the shared library. + +-Package: libhfobjc`'OBJC_SO-dbg`'LS ++Package: libhfobjc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: extra +-Depends: BASEDEP, libhfobjc`'OBJC_SO`'LS (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg`'LS, ${misc:Depends} ++Depends: BASEDEP, libhfobjc`'OBJC_SO (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-dbg-armhf [biarchhf_archs] + Description: Runtime library for GNU Objective-C applications (hard float ABI debug symbols) + Library needed for GNU ObjC applications linked against the shared library. + ')`'dnl libhfobjc + + ifenabled(`libsfobjc',` +-Package: libsfobjc`'OBJC_SO`'LS ++Package: libsfobjc`'OBJC_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-armel [biarchsf_archs] + Description: Runtime library for GNU Objective-C applications (soft float ABI) + Library needed for GNU ObjC applications linked against the shared library. + +-Package: libsfobjc`'OBJC_SO-dbg`'LS ++Package: libsfobjc`'OBJC_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: extra +-Depends: BASEDEP, libsfobjc`'OBJC_SO`'LS (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg`'LS, ${misc:Depends} ++Depends: BASEDEP, libsfobjc`'OBJC_SO (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-dbg-armel [biarchsf_archs] + Description: Runtime library for GNU Objective-C applications (soft float ABI debug symbols) + Library needed for GNU ObjC applications linked against the shared library. + ')`'dnl libsfobjc + + ifenabled(`libneonobjc',` +-Package: libobjc`'OBJC_SO-neon`'LS ++Package: libobjc`'OBJC_SO-neon + Section: libs + Architecture: NEON_ARCHS + Priority: PRI(optional) +-Depends: BASEDEP, libc6-neon`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libc6-neon`'AQ, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications [NEON version] + Library needed for GNU ObjC applications linked against the shared library. + . +@@ -1468,9 +1468,9 @@ + Package: gfortran`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libgfortran`'FORTRAN_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libgfortran`'FORTRAN_SO`'AQ (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} + Provides: fortran95-compiler +-Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libgfortran`'FORTRAN_SO-dbg`'LS ++Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libgfortran`'FORTRAN_SO-dbg`'AQ + Replaces: libgfortran`'FORTRAN_SO-dev + Description: GNU Fortran compiler + This is the GNU Fortran compiler, which compiles +@@ -1503,9 +1503,9 @@ + ')`'dnl fdev + + ifenabled(`libgfortran',` +-Package: libgfortran`'FORTRAN_SO`'LS ++Package: libgfortran`'FORTRAN_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +@@ -1516,42 +1516,42 @@ + Library needed for GNU Fortran applications linked against the + shared library. + +-Package: libgfortran`'FORTRAN_SO-dbg`'LS ++Package: libgfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + ')`Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf]') + Priority: extra +-Depends: BASEDEP, libgfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libgfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (debug symbols) + Library needed for GNU Fortran applications linked against the + shared library. + ')`'dnl libgfortran + + ifenabled(`lib64gfortran',` +-Package: lib64gfortran`'FORTRAN_SO`'LS ++Package: lib64gfortran`'FORTRAN_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications (64bit) + Library needed for GNU Fortran applications linked against the + shared library. + +-Package: lib64gfortran`'FORTRAN_SO-dbg`'LS ++Package: lib64gfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: extra +-Depends: BASEDEP, lib64gfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib64gfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (64bit debug symbols) + Library needed for GNU Fortran applications linked against the + shared library. + ')`'dnl lib64gfortran + + ifenabled(`lib32gfortran',` +-Package: lib32gfortran`'FORTRAN_SO`'LS ++Package: lib32gfortran`'FORTRAN_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1559,40 +1559,40 @@ + Library needed for GNU Fortran applications linked against the + shared library. + +-Package: lib32gfortran`'FORTRAN_SO-dbg`'LS ++Package: lib32gfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: extra +-Depends: BASEDEP, lib32gfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib32gfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (32 bit debug symbols) + Library needed for GNU Fortran applications linked against the + shared library. + ')`'dnl lib32gfortran + + ifenabled(`libn32gfortran',` +-Package: libn32gfortran`'FORTRAN_SO`'LS ++Package: libn32gfortran`'FORTRAN_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications (n32) + Library needed for GNU Fortran applications linked against the + shared library. + +-Package: libn32gfortran`'FORTRAN_SO-dbg`'LS ++Package: libn32gfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: extra +-Depends: BASEDEP, libn32gfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libn32gfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (n32 debug symbols) + Library needed for GNU Fortran applications linked against the + shared library. + ')`'dnl libn32gfortran + + ifenabled(`libhfgfortran',` +-Package: libhfgfortran`'FORTRAN_SO`'LS ++Package: libhfgfortran`'FORTRAN_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-armhf [biarchhf_archs] +@@ -1600,11 +1600,11 @@ + Library needed for GNU Fortran applications linked against the + shared library. + +-Package: libhfgfortran`'FORTRAN_SO-dbg`'LS ++Package: libhfgfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Priority: extra +-Depends: BASEDEP, libhfgfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libhfgfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-dbg-armhf [biarchhf_archs] + Description: Runtime library for GNU Fortran applications (hard float ABI debug symbols) + Library needed for GNU Fortran applications linked against the +@@ -1612,9 +1612,9 @@ + ')`'dnl libhfgfortran + + ifenabled(`libsfgfortran',` +-Package: libsfgfortran`'FORTRAN_SO`'LS ++Package: libsfgfortran`'FORTRAN_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-armel [biarchsf_archs] +@@ -1622,11 +1622,11 @@ + Library needed for GNU Fortran applications linked against the + shared library. + +-Package: libsfgfortran`'FORTRAN_SO-dbg`'LS ++Package: libsfgfortran`'FORTRAN_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Priority: extra +-Depends: BASEDEP, libsfgfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libsfgfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-dbg-armel [biarchsf_archs] + Description: Runtime library for GNU Fortran applications (hard float ABI debug symbols) + Library needed for GNU Fortran applications linked against the +@@ -1634,7 +1634,7 @@ + ')`'dnl libsfgfortran + + ifenabled(`libneongfortran',` +-Package: libgfortran`'FORTRAN_SO-neon`'LS ++Package: libgfortran`'FORTRAN_SO-neon + Section: libs + Architecture: NEON_ARCHS + ifdef(`MULTIARCH', `Multi-Arch: same +@@ -1642,7 +1642,7 @@ + Breaks: ${multiarch:breaks} + ')`'dnl + Priority: extra +-Depends: BASEDEP, libgcc1-neon`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libgcc1-neon, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications [NEON version] + Library needed for GNU Fortran applications linked against the + shared library. +@@ -1657,9 +1657,9 @@ + Package: gccgo`'PV`'TS + Architecture: any + Priority: ifdef(`TARGET',`extra',`PRI(optional)') +-Depends: BASEDEP, ifdef(`STANDALONEGO',,`gcc`'PV`'TS (= ${gcc:Version}), ')libgo`'GO_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, ifdef(`STANDALONEGO',,`gcc`'PV`'TS (= ${gcc:Version}), ')libgo`'GO_SO`'AQ (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} + Provides: go-compiler +-Suggests: ${go:multilib}, gccgo`'PV-doc, libgo`'GO_SO-dbg`'LS ++Suggests: ${go:multilib}, gccgo`'PV-doc, libgo`'GO_SO-dbg`'AQ + Description: GNU Go compiler + This is the GNU Go compiler, which compiles Go on platforms supported + by the gcc compiler. It uses the gcc backend to generate optimized code. +@@ -1691,9 +1691,9 @@ + ')`'dnl fdev + + ifenabled(`libggo',` +-Package: libgo`'GO_SO`'LS ++Package: libgo`'GO_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ')`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]') +@@ -1703,42 +1703,42 @@ + Library needed for GNU Go applications linked against the + shared library. + +-Package: libgo`'GO_SO-dbg`'LS ++Package: libgo`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same + ')`Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf]') + Priority: extra +-Depends: BASEDEP, libgo`'GO_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libgo`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (debug symbols) + Library needed for GNU Go applications linked against the + shared library. + ')`'dnl libgo + + ifenabled(`lib64go',` +-Package: lib64go`'GO_SO`'LS ++Package: lib64go`'GO_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications (64bit) + Library needed for GNU Go applications linked against the + shared library. + +-Package: lib64go`'GO_SO-dbg`'LS ++Package: lib64go`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Priority: extra +-Depends: BASEDEP, lib64go`'GO_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib64go`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (64bit debug symbols) + Library needed for GNU Go applications linked against the + shared library. + ')`'dnl lib64go + + ifenabled(`lib32go',` +-Package: lib32go`'GO_SO`'LS ++Package: lib32go`'GO_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +@@ -1746,31 +1746,31 @@ + Library needed for GNU Go applications linked against the + shared library. + +-Package: lib32go`'GO_SO-dbg`'LS ++Package: lib32go`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Priority: extra +-Depends: BASEDEP, lib32go`'GO_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, lib32go`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (32 bit debug symbols) + Library needed for GNU Go applications linked against the + shared library. + ')`'dnl lib32go + + ifenabled(`libn32go',` +-Package: libn32go`'GO_SO`'LS ++Package: libn32go`'GO_SO + Section: ifdef(`TARGET',`devel',`libs') +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications (n32) + Library needed for GNU Go applications linked against the + shared library. + +-Package: libn32go`'GO_SO-dbg`'LS ++Package: libn32go`'GO_SO-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Priority: extra +-Depends: BASEDEP, libn32go`'GO_SO`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libn32go`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (n32 debug symbols) + Library needed for GNU Go applications linked against the + shared library. +@@ -1978,8 +1978,8 @@ + + ifenabled(`c++',` + ifenabled(`libcxx',` +-Package: libstdc++CXX_SO`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libstdc++CXX_SO ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(important)) + Depends: BASEDEP, ${dep:libc}, ${shlibs:Depends}, ${misc:Depends} +@@ -2004,11 +2004,11 @@ + ')`'dnl libcxx + + ifenabled(`lib32cxx',` +-Package: lib32stdc++CXX_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32stdc++CXX_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: extra +-Depends: BASEDEP, lib32gcc1`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, lib32gcc1, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-TARGET-dcv1 + ',`')`'dnl +@@ -2023,11 +2023,11 @@ + ')`'dnl lib32cxx + + ifenabled(`lib64cxx',` +-Package: lib64stdc++CXX_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64stdc++CXX_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) +-Depends: BASEDEP, ${shlibs:Depends}, lib64gcc1`'LS, ${misc:Depends} ++Depends: BASEDEP, ${shlibs:Depends}, lib64gcc1, ${misc:Depends} + ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-TARGET-dcv1 + ',`')`'dnl + Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (64bit) +@@ -2045,11 +2045,11 @@ + ')`'dnl lib64cxx + + ifenabled(`libn32cxx',` +-Package: libn32stdc++CXX_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32stdc++CXX_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) +-Depends: BASEDEP, ${shlibs:Depends}, libn32gcc1`'LS, ${misc:Depends} ++Depends: BASEDEP, ${shlibs:Depends}, libn32gcc1, ${misc:Depends} + ifdef(`TARGET',`Provides: libn32stdc++CXX_SO-TARGET-dcv1 + ',`')`'dnl + Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (n32) +@@ -2067,11 +2067,11 @@ + ')`'dnl libn32cxx + + ifenabled(`libhfcxx',` +-Package: libhfstdc++CXX_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfstdc++CXX_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) +-Depends: BASEDEP, ${shlibs:Depends}, libhfgcc1`'LS, ${misc:Depends} ++Depends: BASEDEP, ${shlibs:Depends}, libhfgcc1, ${misc:Depends} + ifdef(`TARGET',`Provides: libhfstdc++CXX_SO-TARGET-dcv1 + ',`')`'dnl + Conflicts: libstdc++'CXX_SO`-armhf [biarchhf_archs] +@@ -2090,11 +2090,11 @@ + ')`'dnl libhfcxx + + ifenabled(`libsfcxx',` +-Package: libsfstdc++CXX_SO`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfstdc++CXX_SO ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: ifdef(`TARGET',`devel',`libs') + Priority: ifdef(`TARGET',`extra',PRI(optional)) +-Depends: BASEDEP, ${shlibs:Depends}, libsfgcc1`'LS, ${misc:Depends} ++Depends: BASEDEP, ${shlibs:Depends}, libsfgcc1, ${misc:Depends} + ifdef(`TARGET',`Provides: libsfstdc++CXX_SO-TARGET-dcv1 + ',`')`'dnl + Conflicts: libstdc++'CXX_SO`-armel [biarchsf_archs] +@@ -2113,11 +2113,11 @@ + ')`'dnl libsfcxx + + ifenabled(`libneoncxx',` +-Package: libstdc++CXX_SO-neon`'LS ++Package: libstdc++CXX_SO-neon + Architecture: NEON_ARCHS + Section: libs + Priority: extra +-Depends: BASEDEP, libc6-neon`'LS, libgcc1-neon`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libc6-neon`'AQ, libgcc1-neon, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Standard C++ Library v3 [NEON version] + This package contains an additional runtime library for C++ programs + built with the GNU compiler. +@@ -2127,18 +2127,18 @@ + ')`'dnl + + ifenabled(`c++dev',` +-Package: libstdc++CXX_SO`'PV-dev`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libstdc++CXX_SO`'PV-dev ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: ifdef(`TARGET',`devel',`libdevel') + Priority: ifdef(`TARGET',`extra',PRI(optional)) + ifdef(`MULTIARCH', `Multi-Arch: same + ')`'dnl +-Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} ++Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} + ifdef(`TARGET',`',`dnl native + Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev + Suggests: libstdc++CXX_SO`'PV-doc + ')`'dnl native +-Provides: libstdc++-dev`'LS`'ifdef(`TARGET',`, libstdc++-dev-TARGET-dcv1, libstdc++CXX_SO-dev-TARGET-dcv1') ++Provides: libstdc++-dev`'ifdef(`TARGET',`, libstdc++-dev-TARGET-dcv1, libstdc++CXX_SO-dev-TARGET-dcv1') + Description: GNU Standard C++ Library v3 (development files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the headers and static library files necessary for + building C++ programs which use libstdc++. +@@ -2152,11 +2152,11 @@ + environment. + ')`'dnl + +-Package: libstdc++CXX_SO`'PV-pic`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libstdc++CXX_SO`'PV-pic ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: ifdef(`TARGET',`devel',`libdevel') + Priority: extra +-Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), ${misc:Depends} ++Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), ${misc:Depends} + ifdef(`TARGET',`Provides: libstdc++CXX_SO-pic-TARGET-dcv1 + ',`')`'dnl + Description: GNU Standard C++ Library v3 (shared library subset kit)`'ifdef(`TARGET)',` (TARGET)', `') +@@ -2170,17 +2170,17 @@ + environment. + ')`'dnl + +-Package: libstdc++CXX_SO`'PV-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`any') ++Package: libstdc++CXX_SO`'PV-dbg ++Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra +-Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), libgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} + ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1',`dnl + ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]dnl + ') +-Recommends: libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}) +-Conflicts: libstdc++5-dbg`'LS, libstdc++5-3.3-dbg`'LS, libstdc++6-dbg`'LS, libstdc++6-4.0-dbg`'LS, libstdc++6-4.1-dbg`'LS, libstdc++6-4.2-dbg`'LS, libstdc++6-4.3-dbg`'LS, libstdc++6-4.4-dbg`'LS, libstdc++6-4.5-dbg`'LS, libstdc++6-4.6-dbg`'LS ++Recommends: libstdc++CXX_SO`'PV-dev (= ${gcc:Version}) ++Conflicts: libstdc++5-dbg, libstdc++5-3.3-dbg, libstdc++6-dbg, libstdc++6-4.0-dbg, libstdc++6-4.1-dbg, libstdc++6-4.2-dbg, libstdc++6-4.3-dbg, libstdc++6-4.4-dbg, libstdc++6-4.5-dbg, libstdc++6-4.6-dbg + Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the shared library of libstdc++ compiled with + debugging symbols. +@@ -2190,14 +2190,14 @@ + environment. + ')`'dnl + +-Package: lib32stdc++CXX_SO`'PV-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch32_archs') ++Package: lib32stdc++CXX_SO`'PV-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib32stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, lib32stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} + ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-dbg-TARGET-dcv1 + ',`')`'dnl +-Conflicts: lib32stdc++6-dbg`'LS, lib32stdc++6-4.0-dbg`'LS, lib32stdc++6-4.1-dbg`'LS, lib32stdc++6-4.2-dbg`'LS, lib32stdc++6-4.3-dbg`'LS, lib32stdc++6-4.4-dbg`'LS, lib32stdc++6-4.5-dbg`'LS, lib32stdc++6-4.6-dbg`'LS ++Conflicts: lib32stdc++6-dbg, lib32stdc++6-4.0-dbg, lib32stdc++6-4.1-dbg, lib32stdc++6-4.2-dbg, lib32stdc++6-4.3-dbg, lib32stdc++6-4.4-dbg, lib32stdc++6-4.5-dbg, lib32stdc++6-4.6-dbg + Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the shared library of libstdc++ compiled with + debugging symbols. +@@ -2207,14 +2207,14 @@ + environment. + ')`'dnl + +-Package: lib64stdc++CXX_SO`'PV-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarch64_archs') ++Package: lib64stdc++CXX_SO`'PV-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, lib64stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, lib64stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} + ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-dbg-TARGET-dcv1 + ',`')`'dnl +-Conflicts: lib64stdc++6-dbg`'LS, lib64stdc++6-4.0-dbg`'LS, lib64stdc++6-4.1-dbg`'LS, lib64stdc++6-4.2-dbg`'LS, lib64stdc++6-4.3-dbg`'LS, lib64stdc++6-4.4-dbg`'LS, lib64stdc++6-4.5-dbg`'LS, lib64stdc++6-4.6-dbg`'LS ++Conflicts: lib64stdc++6-dbg, lib64stdc++6-4.0-dbg, lib64stdc++6-4.1-dbg, lib64stdc++6-4.2-dbg, lib64stdc++6-4.3-dbg, lib64stdc++6-4.4-dbg, lib64stdc++6-4.5-dbg, lib64stdc++6-4.6-dbg + Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the shared library of libstdc++ compiled with + debugging symbols. +@@ -2224,14 +2224,14 @@ + environment. + ')`'dnl + +-Package: libn32stdc++CXX_SO`'PV-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchn32_archs') ++Package: libn32stdc++CXX_SO`'PV-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libn32stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libn32stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} + ifdef(`TARGET',`Provides: libn32stdc++CXX_SO-dbg-TARGET-dcv1 + ',`')`'dnl +-Conflicts: libn32stdc++6-dbg`'LS, libn32stdc++6-4.0-dbg`'LS, libn32stdc++6-4.1-dbg`'LS, libn32stdc++6-4.2-dbg`'LS, libn32stdc++6-4.3-dbg`'LS, libn32stdc++6-4.4-dbg`'LS, libn32stdc++6-4.5-dbg`'LS, libn32stdc++6-4.6-dbg`'LS ++Conflicts: libn32stdc++6-dbg, libn32stdc++6-4.0-dbg, libn32stdc++6-4.1-dbg, libn32stdc++6-4.2-dbg, libn32stdc++6-4.3-dbg, libn32stdc++6-4.4-dbg, libn32stdc++6-4.5-dbg, libn32stdc++6-4.6-dbg + Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the shared library of libstdc++ compiled with + debugging symbols. +@@ -2242,14 +2242,14 @@ + ')`'dnl + + ifenabled(`libhfdbgcxx',` +-Package: libhfstdc++CXX_SO`'PV-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchhf_archs') ++Package: libhfstdc++CXX_SO`'PV-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libhfstdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libhfstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} + ifdef(`TARGET',`Provides: libhfstdc++CXX_SO-dbg-TARGET-dcv1 + ',`')`'dnl +-Conflicts: libhfstdc++6-dbg`'LS, libhfstdc++6-4.3-dbg`'LS, libhfstdc++6-4.4-dbg`'LS, libhfstdc++6-4.5-dbg`'LS, libhfstdc++6-4.6-dbg`'LS, libstdc++'CXX_SO`-armhf [biarchhf_archs] ++Conflicts: libhfstdc++6-dbg, libhfstdc++6-4.3-dbg, libhfstdc++6-4.4-dbg, libhfstdc++6-4.5-dbg, libhfstdc++6-4.6-dbg, libstdc++'CXX_SO`-armhf [biarchhf_archs] + Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the shared library of libstdc++ compiled with + debugging symbols. +@@ -2261,14 +2261,14 @@ + ')`'dnl libhfdbgcxx + + ifenabled(`libsfdbgcxx',` +-Package: libsfstdc++CXX_SO`'PV-dbg`'LS +-Architecture: ifdef(`TARGET',`all',`biarchsf_archs') ++Package: libsfstdc++CXX_SO`'PV-dbg ++Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') + Section: debug + Priority: extra +-Depends: BASEDEP, libsfstdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} ++Depends: BASEDEP, libsfstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} + ifdef(`TARGET',`Provides: libsfstdc++CXX_SO-dbg-TARGET-dcv1 + ',`')`'dnl +-Conflicts: libsfstdc++6-dbg`'LS, libsfstdc++6-4.3-dbg`'LS, libsfstdc++6-4.4-dbg`'LS, libsfstdc++6-4.5-dbg`'LS, libsfstdc++6-4.6-dbg`'LS, libstdc++'CXX_SO`-armel [biarchsf_archs] ++Conflicts: libsfstdc++6-dbg, libsfstdc++6-4.3-dbg, libsfstdc++6-4.4-dbg, libsfstdc++6-4.5-dbg, libsfstdc++6-4.6-dbg, libstdc++'CXX_SO`-armel [biarchsf_archs] + Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') + This package contains the shared library of libstdc++ compiled with + debugging symbols. +@@ -2543,7 +2543,7 @@ + + Package: libphobos`'PHOBOS_V`'PV`'TS-dbg + Section: debug +-Architecture: ifdef(`TARGET',`all',`any') ++Architecture: ifdef(`TARGET',`TARGET',`any') + Priority: extra + Depends: gdc`'PV`'TS (= ${gdc:Version}), libphobos`'PHOBOS_V`'PV-dev (= ${gdc:Version}), ${misc:Depends} + Provides: libphobos`'PHOBOS_V`'TS-dbg +diff --git a/debian/rules.conf b/debian/rules.conf +--- a/debian/rules.conf ++++ b/debian/rules.conf +@@ -11,11 +11,11 @@ + # libgompbiarch variable, and make it contains the libgompbiarch{32,64,n32} + # variables if biarch{32,64,n32} is set to yes. + define gen_multilib_deps +- lib$1biarch64 := lib64$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS) (>= $$$${gcc:Version}) +- lib$1biarch32 := lib32$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS) (>= $$$${gcc:Version}) +- lib$1biarchn32 := libn32$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS) (>= $$$${gcc:Version}) +- lib$1biarchhf := libhf$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS) (>= $$$${gcc:Version}) +- lib$1biarchsf := libsf$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS) (>= $$$${gcc:Version}) ++ lib$1biarch64 := lib64$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(AQ) (>= $$$${gcc:Version}) ++ lib$1biarch32 := lib32$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(AQ) (>= $$$${gcc:Version}) ++ lib$1biarchn32 := libn32$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(AQ) (>= $$$${gcc:Version}) ++ lib$1biarchhf := libhf$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(AQ) (>= $$$${gcc:Version}) ++ lib$1biarchsf := libsf$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(AQ) (>= $$$${gcc:Version}) + ifeq ($$(biarch64),yes) + lib$1biarch := $$(lib$1biarch64) + endif +@@ -30,10 +30,10 @@ + endif + endif + ifeq ($$(biarchhf),yes) +- lib$1biarch := $$(lib$1biarchhf) | lib$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS)-armhf ++ lib$1biarch := $$(lib$1biarchhf) | lib$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)-armhf$(AQ) + endif + ifeq ($$(biarchsf),yes) +- lib$1biarch := $$(lib$1biarchsf) | lib$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)$(LS)-armel ++ lib$1biarch := $$(lib$1biarchsf) | lib$1$$($(shell echo $1 | tr "a-z" "A-Z")_SONAME)-armel$(AQ) + endif + endef + $(foreach x,gomp mudflap ssp gfortran itm objc quadmath go,$(eval $(call gen_multilib_deps,$(x)))) +@@ -174,8 +174,8 @@ + LIBC_DEV_DEP = $(LIBC_DEP)-dev + # for cross + ifeq ($(DEB_CROSS),yes) +- LIBC_DEP ?= $(LIBC_DEP)$(LS) +- LIBC_DEV_DEP ?= $(LIBC_DEV_DEP)$(LS) ++ LIBC_DEP ?= $(LIBC_DEP)$(AQ) ++ LIBC_DEV_DEP ?= $(LIBC_DEV_DEP)$(AQ) + endif + + # this is about Debian archs name, *NOT* GNU target triplet +@@ -197,15 +197,15 @@ + LIBCXX_BIARCH_DEP := + LIBCXX_BIARCH_DBG_DEP := + ifneq (,$(findstring yes,$(biarch64) $(biarch32) $(biarchn32)$(biarchhf)$(biarchsf))) +- LIBC_BIARCH_DEP := $(LIBC_DEP)-$(biarch_deb_arch)$(LS) (>= $(libc_ver)) +- LIBC_BIARCH_DEV_DEP := $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS) (>= $(libc_ver)) ++ LIBC_BIARCH_DEP := $(LIBC_DEP)-$(biarch_deb_arch)$(AQ) (>= $(libc_ver)) ++ LIBC_BIARCH_DEV_DEP := $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(AQ) (>= $(libc_ver)) + ifeq ($(biarch64),yes) +- LIBCXX_BIARCH_DEP := lib64stdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version}) +- LIBCXX_BIARCH_DBG_DEP := lib64stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) ++ LIBCXX_BIARCH_DEP := lib64stdc++$(CXX_SONAME)$(AQ) (>= $${gcc:Version}) ++ LIBCXX_BIARCH_DBG_DEP := lib64stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(AQ) + endif + ifeq ($(biarch32),yes) +- LIBCXX_BIARCH_DEP := lib32stdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version}) +- LIBCXX_BIARCH_DBG_DEP := lib32stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) ++ LIBCXX_BIARCH_DEP := lib32stdc++$(CXX_SONAME)$(AQ) (>= $${gcc:Version}) ++ LIBCXX_BIARCH_DBG_DEP := lib32stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(AQ) + endif + ifeq ($(biarchn32),yes) + ifneq (,$(findstring $(DEB_TARGET_ARCH),mips mipsel)) +@@ -213,28 +213,28 @@ + ifeq ($(biarch64),yes) + triarch := $(COMMA)$(SPACE) + endif +- LIBC_BIARCH_DEV_DEP += $(triarch)libc6-dev-mipsn32$(LS) (>= $(libc_ver)) +- LIBC_BIARCH_DEP += $(triarch)libc6-mipsn32$(LS) (>= $(libc_ver)) +- LIBCXX_BIARCH_DEP += $(triarch)libn32stdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version}) +- LIBCXX_BIARCH_DBG_DEP += $(triarch)libn32stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) ++ LIBC_BIARCH_DEV_DEP += $(triarch)libc6-dev-mipsn32$(AQ) (>= $(libc_ver)) ++ LIBC_BIARCH_DEP += $(triarch)libc6-mipsn32$(AQ) (>= $(libc_ver)) ++ LIBCXX_BIARCH_DEP += $(triarch)libn32stdc++$(CXX_SONAME)$(AQ) (>= $${gcc:Version}) ++ LIBCXX_BIARCH_DBG_DEP += $(triarch)libn32stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(AQ) + endif + endif + ifeq ($(biarchhf),yes) +- LIBCXX_BIARCH_DEP := libhfstdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version}) | libstdc++$(CXX_SONAME)$(LS)-armhf +- LIBCXX_BIARCH_DBG_DEP := libhfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)$(LS)-dbg-armhf +- LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(LS) +- LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS) ++ LIBCXX_BIARCH_DEP := libhfstdc++$(CXX_SONAME)$(AQ) (>= $${gcc:Version}) | libstdc++$(CXX_SONAME)-armhf$(AQ) ++ LIBCXX_BIARCH_DBG_DEP := libhfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(AQ) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg-armhf$(AQ) ++ LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(AQ) ++ LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(AQ) + endif + ifeq ($(biarchsf),yes) +- LIBCXX_BIARCH_DEP := libsfstdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version}) | libstdc++$(CXX_SONAME)$(LS)-armel +- LIBCXX_BIARCH_DBG_DEP := libsfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)$(LS)-dbg-armel +- LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(LS) +- LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS) ++ LIBCXX_BIARCH_DEP := libsfstdc++$(CXX_SONAME)$(AQ) (>= $${gcc:Version}) | libstdc++$(CXX_SONAME)-armel$(AQ) ++ LIBCXX_BIARCH_DBG_DEP := libsfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(AQ) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg-armel$(AQ) ++ LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(AQ) ++ LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(AQ) + endif + endif + + # Add suffix and required version +-LIBC_DEV_DEP := $(LIBC_DEV_DEP)$(LS) (>= $(libc_dev_ver)) ++LIBC_DEV_DEP := $(LIBC_DEV_DEP)$(AQ) (>= $(libc_dev_ver)) + + # TODO: make this automatic, there must be a better way to define LIBC_DEP. + ifneq ($(DEB_CROSS),yes) +@@ -260,9 +260,9 @@ + + GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)], + +-LIBUNWIND_DEV_DEP := libunwind7-dev$(LS) (>= 0.98.5-6) ++LIBUNWIND_DEV_DEP := libunwind7-dev$(AQ) (>= 0.98.5-6) + LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64], +-LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS) [ia64], ++LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(AQ) [ia64], + ifneq ($(DEB_TARGET_ARCH),ia64) + LIBUNWIND_DEV_DEP := # nothing + endif +@@ -434,9 +434,9 @@ + + else + # build cross compiler +- CROSS_BUILD_DEP := libc6-dev$(cross_lib_arch), ++ CROSS_BUILD_DEP := libc6-dev$(AQ), + ifeq ($(REVERSE_CROSS),yes) +- CROSS_BUILD_DEP += zlib1g-dev$(cross_lib_arch), libmpfr-dev$(cross_lib_arch), ++ CROSS_BUILD_DEP += zlib1g-dev$(AQ), libmpfr-dev$(AQ), + endif + SOURCE_BUILD_DEP := + ifeq (,$(findstring gcc,$(PKGSOURCE))) +@@ -505,26 +505,26 @@ + endif + + ifeq ($(with_shared_libgcc),yes) +-LIBGCC_DEP := libgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) ++LIBGCC_DEP := libgcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) + LIBGCC_BIARCH_DEP := + ifeq ($(biarch64),yes) +- LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) ++ LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) + endif + ifeq ($(biarch32),yes) +- LIBGCC_BIARCH_DEP := lib32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) ++ LIBGCC_BIARCH_DEP := lib32gcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) + endif + ifeq ($(biarchn32),yes) + ifeq ($(biarch64),yes) +- LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)), libn32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) ++ LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)), libn32gcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) + else +- LIBGCC_BIARCH_DEP := libn32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) ++ LIBGCC_BIARCH_DEP := libn32gcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) + endif + endif + ifeq ($(biarchhf),yes) +- LIBGCC_BIARCH_DEP := libhfgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) | libgcc1-armhf ++ LIBGCC_BIARCH_DEP := libhfgcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) | libgcc1-armhf + endif + ifeq ($(biarchsf),yes) +- LIBGCC_BIARCH_DEP := libsfgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) | libgcc1-armel ++ LIBGCC_BIARCH_DEP := libsfgcc$(GCC_SONAME)$(AQ) (>= $(DEB_LIBGCC_VERSION)) | libgcc1-armel + endif + endif # $(with_shared_libgcc) + +@@ -576,7 +576,7 @@ + -DNEON_ARCHS="$(neon_archs)" \ + -DTP=$(TP) \ + -DTS=$(TS) \ +- -DLS=$(LS) ++ -DAQ=$(AQ) + + ifeq ($(DEB_CROSS),yes) + ctrl_flags += \ +@@ -868,15 +868,15 @@ + >> debian/substvars.local.tmp + endif + ifeq ($(with_gomp),yes) +- echo 'dep:libgomp=libgomp$(GOMP_SONAME)$(LS) (>= $${gcc:Version})' \ ++ echo 'dep:libgomp=libgomp$(GOMP_SONAME)$(AQ) (>= $${gcc:Version})' \ + >> debian/substvars.local.tmp + endif + ifeq ($(with_itm),yes) +- echo 'dep:libitm=libitm$(ITM_SONAME)$(LS) (>= $${gcc:Version})' \ ++ echo 'dep:libitm=libitm$(ITM_SONAME)$(AQ) (>= $${gcc:Version})' \ + >> debian/substvars.local.tmp + endif + ifeq ($(with_qmath),yes) +- echo 'dep:libqmath=libquadmath$(QUADMATH_SONAME)$(LS) (>= $${gcc:Version})' \ ++ echo 'dep:libqmath=libquadmath$(QUADMATH_SONAME)$(AQ) (>= $${gcc:Version})' \ + >> debian/substvars.local.tmp + endif + ifeq ($(multilib),yes) +diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk +--- a/debian/rules.d/binary-fortran.mk ++++ b/debian/rules.d/binary-fortran.mk +@@ -32,7 +32,7 @@ + p_g95 = gfortran$(pkg_ver)$(cross_bin_arch) + p_g95_m = gfortran$(pkg_ver)-multilib$(cross_bin_arch) + p_g95d = gfortran$(pkg_ver)-doc +-p_flib = libgfortran$(FORTRAN_SONAME)$(cross_lib_arch) ++p_flib = libgfortran$(FORTRAN_SONAME) + + d_g95 = debian/$(p_g95) + d_g95_m = debian/$(p_g95_m) +@@ -72,13 +72,10 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) +- $(call cross_mangle_shlibs,$(p_l)) + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \ + -L$(p_l$(2)quadmath) -l:$(d)/$(usr_lib$(2)): || echo FIXME libgfortran symbols +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + if [ -f debian/$(p_l).overrides ]; then \ + mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \ + cp debian/$(p_l).overrides debian/$(p_l)/usr/share/lintian/overrides/$(p_l); \ +diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk +--- a/debian/rules.d/binary-go.mk ++++ b/debian/rules.d/binary-go.mk +@@ -24,7 +24,7 @@ + p_go = gccgo$(pkg_ver)$(cross_bin_arch) + p_go_m = gccgo$(pkg_ver)-multilib$(cross_bin_arch) + p_god = gccgo$(pkg_ver)-doc +-p_golib = libgo$(GO_SONAME)$(cross_lib_arch) ++p_golib = libgo$(GO_SONAME) + + d_go = debian/$(p_go) + d_go_m = debian/$(p_go_m) +@@ -133,13 +133,10 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) +- $(call cross_mangle_shlibs,$(p_l)) + $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \ + -L$(p_l$(2)go) -l:$(d)/$(usr_lib$(2)): +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) + dh_md5sums -p$(p_l) -p$(p_d) + dh_builddeb -p$(p_l) -p$(p_d) +diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk +--- a/debian/rules.d/binary-libgcc.mk ++++ b/debian/rules.d/binary-libgcc.mk +@@ -18,33 +18,33 @@ + endif + endif + +-p_lgcc = libgcc$(GCC_SONAME)$(cross_lib_arch) +-p_lgccdbg = libgcc$(GCC_SONAME)-dbg$(cross_lib_arch) ++p_lgcc = libgcc$(GCC_SONAME) ++p_lgccdbg = libgcc$(GCC_SONAME)-dbg + d_lgcc = debian/$(p_lgcc) + d_lgccdbg = debian/$(p_lgccdbg) + +-p_l32gcc = lib32gcc$(GCC_SONAME)$(cross_lib_arch) +-p_l32gccdbg = lib32gcc$(GCC_SONAME)-dbg$(cross_lib_arch) ++p_l32gcc = lib32gcc$(GCC_SONAME) ++p_l32gccdbg = lib32gcc$(GCC_SONAME)-dbg + d_l32gcc = debian/$(p_l32gcc) + d_l32gccdbg = debian/$(p_l32gccdbg) + +-p_l64gcc = lib64gcc$(GCC_SONAME)$(cross_lib_arch) +-p_l64gccdbg = lib64gcc$(GCC_SONAME)-dbg$(cross_lib_arch) ++p_l64gcc = lib64gcc$(GCC_SONAME) ++p_l64gccdbg = lib64gcc$(GCC_SONAME)-dbg + d_l64gcc = debian/$(p_l64gcc) + d_l64gccdbg = debian/$(p_l64gccdbg) + +-p_ln32gcc = libn32gcc$(GCC_SONAME)$(cross_lib_arch) +-p_ln32gccdbg = libn32gcc$(GCC_SONAME)-dbg$(cross_lib_arch) ++p_ln32gcc = libn32gcc$(GCC_SONAME) ++p_ln32gccdbg = libn32gcc$(GCC_SONAME)-dbg + d_ln32gcc = debian/$(p_ln32gcc) + d_ln32gccdbg = debian/$(p_ln32gccdbg) + +-p_lhfgcc = libhfgcc$(GCC_SONAME)$(cross_lib_arch) +-p_lhfgccdbg = libhfgcc$(GCC_SONAME)-dbg$(cross_lib_arch) ++p_lhfgcc = libhfgcc$(GCC_SONAME) ++p_lhfgccdbg = libhfgcc$(GCC_SONAME)-dbg + d_lhfgcc = debian/$(p_lhfgcc) + d_lhfgccdbg = debian/$(p_lhfgccdbg) + +-p_lsfgcc = libsfgcc$(GCC_SONAME)$(cross_lib_arch) +-p_lsfgccdbg = libsfgcc$(GCC_SONAME)-dbg$(cross_lib_arch) ++p_lsfgcc = libsfgcc$(GCC_SONAME) ++p_lsfgccdbg = libsfgcc$(GCC_SONAME)-dbg + d_lsfgcc = debian/$(p_lsfgcc) + d_lsfgccdbg = debian/$(p_lsfgccdbg) + +@@ -76,7 +76,6 @@ + $(if $(filter yes,$(with_shared_libgcc)), + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) -p$(p_d) \ + -- -v$(DEB_LIBGCC_VERSION) +- $(call cross_mangle_shlibs,$(p_l)) + $(if $(filter arm-linux-gnueabi%,$(DEB_TARGET_GNU_TYPE)), + if head -1 $(d_l)/DEBIAN/symbols | grep -q '^lib'; then \ + grep -q '^ __aeabi' $(d_l)/DEBIAN/symbols \ +@@ -87,13 +86,11 @@ + ) + + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) +- $(call cross_mangle_substvars,$(p_l)) + + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_LIBGCC_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + + $(if $(2),, # only for native + mkdir -p $(d_l)/usr/share/lintian/overrides +diff --git a/debian/rules.d/binary-libgomp.mk b/debian/rules.d/binary-libgomp.mk +--- a/debian/rules.d/binary-libgomp.mk ++++ b/debian/rules.d/binary-libgomp.mk +@@ -31,12 +31,9 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) +- $(call cross_mangle_shlibs,$(p_l)) + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) + dh_md5sums -p$(p_l) -p$(p_d) + dh_builddeb -p$(p_l) -p$(p_d) +diff --git a/debian/rules.d/binary-libitm.mk b/debian/rules.d/binary-libitm.mk +--- a/debian/rules.d/binary-libitm.mk ++++ b/debian/rules.d/binary-libitm.mk +@@ -31,12 +31,9 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) +- $(call cross_mangle_shlibs,$(p_l)) + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) + dh_md5sums -p$(p_l) -p$(p_d) + dh_builddeb -p$(p_l) -p$(p_d) +diff --git a/debian/rules.d/binary-libmudflap.mk b/debian/rules.d/binary-libmudflap.mk +--- a/debian/rules.d/binary-libmudflap.mk ++++ b/debian/rules.d/binary-libmudflap.mk +@@ -21,7 +21,7 @@ + endif + endif + +-p_mfd = libmudflap$(MUDFLAP_SONAME)$(pkg_ver)-dev$(cross_lib_arch) ++p_mfd = libmudflap$(MUDFLAP_SONAME)$(pkg_ver)-dev + d_mfd = debian/$(p_mfd) + + define __do_mudflap +@@ -42,12 +42,9 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) -V '$(p_l) (>= $(DEB_SOVERSION))' +- $(call cross_mangle_shlibs,$(p_l)) + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) + dh_md5sums -p$(p_l) -p$(p_d) + dh_builddeb -p$(p_l) -p$(p_d) +diff --git a/debian/rules.d/binary-libobjc.mk b/debian/rules.d/binary-libobjc.mk +--- a/debian/rules.d/binary-libobjc.mk ++++ b/debian/rules.d/binary-libobjc.mk +@@ -42,12 +42,9 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) -Xlibobjc_gc.so +- $(call cross_mangle_shlibs,$(p_l)) + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) + dh_md5sums -p$(p_l) -p$(p_d) + dh_builddeb -p$(p_l) -p$(p_d) +diff --git a/debian/rules.d/binary-libquadmath.mk b/debian/rules.d/binary-libquadmath.mk +--- a/debian/rules.d/binary-libquadmath.mk ++++ b/debian/rules.d/binary-libquadmath.mk +@@ -31,12 +31,9 @@ + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) +- $(call cross_mangle_shlibs,$(p_l)) + $(cross_shlibdeps) dh_shlibdeps -p$(p_l) +- $(call cross_mangle_substvars,$(p_l)) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) + dh_md5sums -p$(p_l) -p$(p_d) + dh_builddeb -p$(p_l) -p$(p_d) +diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk +--- a/debian/rules.d/binary-libstdcxx.mk ++++ b/debian/rules.d/binary-libstdcxx.mk +@@ -42,20 +42,20 @@ + + libstdc_ext = -$(BASE_VERSION) + +-p_lib = libstdc++$(CXX_SONAME)$(cross_lib_arch) +-p_lib64 = lib64stdc++$(CXX_SONAME)$(cross_lib_arch) +-p_lib32 = lib32stdc++$(CXX_SONAME)$(cross_lib_arch) +-p_libn32= libn32stdc++$(CXX_SONAME)$(cross_lib_arch) +-p_libhf = libhfstdc++$(CXX_SONAME)$(cross_lib_arch) +-p_libsf = libsfstdc++$(CXX_SONAME)$(cross_lib_arch) +-p_dev = libstdc++$(CXX_SONAME)$(libstdc_ext)-dev$(cross_lib_arch) +-p_pic = libstdc++$(CXX_SONAME)$(libstdc_ext)-pic$(cross_lib_arch) +-p_dbg = libstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch) +-p_dbg64 = lib64stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch) +-p_dbg32 = lib32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch) +-p_dbgn32= libn32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch) +-p_dbghf = libhfstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch) +-p_dbgsf = libsfstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch) ++p_lib = libstdc++$(CXX_SONAME) ++p_lib64 = lib64stdc++$(CXX_SONAME) ++p_lib32 = lib32stdc++$(CXX_SONAME) ++p_libn32= libn32stdc++$(CXX_SONAME) ++p_libhf = libhfstdc++$(CXX_SONAME) ++p_libsf = libsfstdc++$(CXX_SONAME) ++p_dev = libstdc++$(CXX_SONAME)$(libstdc_ext)-dev ++p_pic = libstdc++$(CXX_SONAME)$(libstdc_ext)-pic ++p_dbg = libstdc++$(CXX_SONAME)$(libstdc_ext)-dbg ++p_dbg64 = lib64stdc++$(CXX_SONAME)$(libstdc_ext)-dbg ++p_dbg32 = lib32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg ++p_dbgn32= libn32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg ++p_dbghf = libhfstdc++$(CXX_SONAME)$(libstdc_ext)-dbg ++p_dbgsf = libsfstdc++$(CXX_SONAME)$(libstdc_ext)-dbg + p_libd = libstdc++$(CXX_SONAME)$(libstdc_ext)-doc + + d_lib = debian/$(p_lib) +@@ -163,13 +163,10 @@ + dh_fixperms -p$(p_l) + + $(cross_makeshlibs) dh_makeshlibs -p$(p_l) || echo FIXME: libstdc++ symbols +- $(call cross_mangle_shlibs,$(p_l)) + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \ + -L$(p_l$(2)gcc) -l:$(d)/$(usr_lib$(2)): +- $(call cross_mangle_substvars,$(p_l)) + + $(cross_gencontrol) dh_gencontrol -p$(p_l) -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) + dh_md5sums -p$(p_l) + dh_builddeb -p$(p_l) +@@ -208,7 +205,6 @@ + + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_d) \ + -L$(p_l$(2)gcc) -l:$(d)/$(usr_lib$(2)): +- $(call cross_mangle_substvars,$(p_d)) + + debian/dh_doclink -p$(p_d) $(p_base) + debian/dh_rmemptydirs -p$(p_d) +@@ -216,7 +212,6 @@ + dh_compress -p$(p_d) + dh_fixperms -p$(p_d) + $(cross_gencontrol) dh_gencontrol -p$(p_d) -- -v$(DEB_VERSION) $(common_substvars) +- $(call cross_mangle_control,$(p_d)) + + dh_installdeb -p$(p_d) + dh_md5sums -p$(p_d) +@@ -356,7 +351,6 @@ + # DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_dev) -p$(p_pic) -p$(p_dbg) -Xlib32/debug + #endif + DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_dev) -p$(p_pic) -p$(p_dbg) +- $(call cross_mangle_substvars,$(p_dbg)) + $(cross_gencontrol) dh_gencontrol -p$(p_dev) -p$(p_pic) -p$(p_dbg) \ + -- -v$(DEB_VERSION) $(common_substvars) + +diff --git a/debian/rules.defs b/debian/rules.defs +--- a/debian/rules.defs ++++ b/debian/rules.defs +@@ -139,16 +139,14 @@ + # names (e.g. powerpc-linux-gcc). + # TS: Target Suffix. Used primarily at the end of cross compiler + # package names (e.g. gcc-powerpc). +- # LS: Library Suffix. Used primarily at the end of cross compiler +- # library package names (e.g. libgcc-powerpc-cross). ++ # AQ: Arch Qualifier. Used for cross-arch dependencies + DEB_TARGET_ALIAS ?= $(DEB_TARGET_GNU_TYPE) + TARGET := $(DEB_TARGET_ARCH) + TP := $(subst _,-,$(DEB_TARGET_GNU_TYPE))- + TS := -$(subst _,-,$(DEB_TARGET_ALIAS)) +- LS := -$(subst _,-,$(DEB_TARGET_ARCH))-cross ++ AQ := :$(TARGET) + + cross_bin_arch := -$(subst _,-,$(DEB_TARGET_ALIAS)) +- cross_lib_arch := -$(subst _,-,$(DEB_TARGET_ARCH))-cross + cmd_prefix := $(DEB_TARGET_GNU_TYPE)- + + TARGET_ALIAS := $(DEB_TARGET_ALIAS) +@@ -1413,26 +1411,3 @@ + stamp-dir: + mkdir -p $(stampdir) + +-ifeq ($(DEB_CROSS),yes) +- define cross_mangle_shlibs +- sed -i s/$(cross_lib_arch)//g debian/$(1)/DEBIAN/shlibs +- endef +- define cross_mangle_substvars +- sed -i 's/lib[^ ,(]*/&$(cross_lib_arch)/g' debian/$(1).substvars +- endef +-else +- define cross_mangle_shlibs +- endef +- define cross_mangle_substvars +- endef +-endif +- +-ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel)) +- define cross_mangle_control +- $(if $(findstring 64,$(1)),sed -i -r '/^(Dep|Rec|Sug)/s/[a-z0-9-]+32[^$(COMMA)]+($(COMMA) *|$$)//g;/^(Dep|Rec|Sug)/s/$(p_lgcc)/$(p_l64gcc)/;/^(Dep|Rec|Sug)/s/ *$(COMMA) *$$//' debian/$(1)/DEBIAN/control,@:) +- $(if $(findstring n32,$(1)),sed -i -r '/^(Dep|Rec|Sug)/s/[a-z0-9-]+64[^$(COMMA)]+($(COMMA) *|$$)//g;/^(Dep|Rec|Sug)/s/$(p_lgcc)/$(p_ln32gcc)/;/^(Dep|Rec|Sug)/s/ *$(COMMA) *$$//' debian/$(1)/DEBIAN/control,@:) +- endef +-else +- define cross_mangle_control +- endef +-endif +diff --git a/debian/rules2 b/debian/rules2 +--- a/debian/rules2 ++++ b/debian/rules2 +@@ -683,8 +683,8 @@ + lib64 = lib64 + libn32 = lib32 + +-p_l= $(1)$(cross_lib_arch) +-p_d= $(1)-dbg$(cross_lib_arch) ++p_l= $(1) ++p_d= $(1)-dbg + d_l= debian/$(p_l) + d_d= debian/$(p_d) + only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0009_Fix_cross_building_for_s390_and_mips.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0009_Fix_cross_building_for_s390_and_mips.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1345984588 -7200 +# Node ID f3197f118ce33a55618f826d6dcf29637146aa0a +# Parent 79c9d114a4e408947c11f4ad671ee1f7eeb20f34 +Fix cross-building for s390 and mips +-- + debian/patches/s390-mips-multiarch_dirname.diff | 29 +++++++++++++++++++++++++ + debian/rules.patch | 1 + + 2 files changed, 30 insertions(+), 0 deletions(-) + +diff --git a/debian/patches/s390-mips-multiarch_dirname.diff b/debian/patches/s390-mips-multiarch_dirname.diff +new file mode 100644 +--- /dev/null ++++ b/debian/patches/s390-mips-multiarch_dirname.diff +@@ -0,0 +1,29 @@ ++--- /dev/null +++++ gcc-4.7-4.7.1/src/gcc/config/mips/t-linux ++@@ -0,0 +1,2 @@ +++MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) +++MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) ++--- /dev/null +++++ gcc-4.7-4.7.1/src/gcc/config/s390/t-linux ++@@ -0,0 +1 @@ +++MULTIARCH_DIRNAME = $(call if_multiarch,s390-linux-gnu) ++--- gcc-4.7-4.7.1.orig/src/gcc/config.gcc +++++ gcc-4.7-4.7.1/src/gcc/config.gcc ++@@ -1783,6 +1783,8 @@ ++ if test x$enable_targets = xall; then ++ tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h" ++ tmake_file="${tmake_file} mips/t-linux64" +++ else +++ tmake_file="${tmake_file} mips/t-linux" ++ fi ++ case ${target} in ++ mipsisa32r2*) ++@@ -2182,6 +2184,8 @@ ++ tm_file="s390/s390.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h s390/linux.h" ++ if test x$enable_targets = xall; then ++ tmake_file="${tmake_file} s390/t-linux64" +++ else +++ tmake_file="${tmake_file} s390/t-linux" ++ fi ++ ;; ++ s390x-*-linux*) +diff --git a/debian/rules.patch b/debian/rules.patch +--- a/debian/rules.patch ++++ b/debian/rules.patch +@@ -263,6 +263,7 @@ + debian_patches += libjava-multiarch + endif + endif ++debian_patches += s390-mips-multiarch_dirname + debian_patches += libjava-nobiarch-check + debian_patches += config-ml + ifeq ($(biarch64),yes) only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0004_Clean_up_control_m4_to_unify_natively_built_packages_and_cross_built_packages.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0004_Clean_up_control_m4_to_unify_natively_built_packages_and_cross_built_packages.patch @@ -0,0 +1,1401 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1338663157 -7200 +# Node ID a13440aa4b28f65deef82298cccf31e5ea0fddfe +# Parent 8fe3799a1bce4aaef6ac3a8f3d4c3591b49c3607 +Clean up control.m4 to unify natively built packages and cross-built packages + +In the “new-style” cross-toolchain, library packages are those of the target architecture, +and should therefore not differ when cross-built. This patch takes that into account +and simplify the control.m4 file by unifying natively-built and cross-built packages. +-- + debian/control.m4 | 599 ++++++++++++++++++----------------------------------- + 1 files changed, 207 insertions(+), 392 deletions(-) + +diff --git a/debian/control.m4 b/debian/control.m4 +--- a/debian/control.m4 ++++ b/debian/control.m4 +@@ -162,178 +162,119 @@ + ifenabled(`libgcc',` + Package: libgcc1 + Architecture: ifdef(`TARGET',`TARGET',`any') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',required) ++Section: libs ++Priority: required + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1', + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-')`Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]') +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') ++')`'dnl ++Provides: libgcc1-armel [armel], libgcc1-armhf [armhf] ++Description: GCC support library + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libgcc1-dbg + Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra + Depends: BASEDEP, libgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +-ifdef(`TARGET',`',`dnl + ifdef(`MULTIARCH',`Multi-Arch: same + ')dnl + Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf] +-')dnl +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libgcc2 + Architecture: ifdef(`TARGET',`TARGET',`m68k') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',required) ++Section: libs ++Priority: required + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libgcc2-TARGET-dcv1 +-',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-'))`'dnl +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') ++')`'dnl ++Description: GCC support library + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libgcc2-dbg + Architecture: ifdef(`TARGET',`TARGET',`m68k') + Section: debug + Priority: extra + Depends: BASEDEP, libgcc2 (= ${gcc:Version}), ${misc:Depends} +-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +-'))`'dnl +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libgcc + + ifenabled(`lib4gcc',` + Package: libgcc4 + Architecture: ifdef(`TARGET',`TARGET',`hppa') +-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-'))`'dnl +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',required) ++')`'dnl ++Section: libs ++Priority: required + Depends: ifdef(`STANDALONEJAVA',`gcj`'PV-base (>= ${gcj:Version})',`BASEDEP'), ${shlibs:Depends}, ${misc:Depends} +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libgcc4-dbg + Architecture: ifdef(`TARGET',`TARGET',`hppa') +-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +-'))`'dnl ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Section: debug + Priority: extra + Depends: BASEDEP, libgcc4 (= ${gcc:Version}), ${misc:Depends} +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl lib4gcc + + ifenabled(`lib64gcc',` + Package: lib64gcc1 + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +-ifdef(`TARGET',`Provides: lib64gcc1-TARGET-dcv1 +-',`')`'dnl + Conflicts: libgcc`'GCC_SO (<= 1:3.3-0pre9) +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (64bit) ++Description: GCC support library (64bit) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: lib64gcc1-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra + Depends: BASEDEP, lib64gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl lib64gcc + + ifenabled(`lib32gcc',` + Package: lib32gcc1 + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Priority: extra + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} + Conflicts: ${confl:lib32} +-ifdef(`TARGET',`Provides: lib32gcc1-TARGET-dcv1 +-',`')`'dnl + Description: GCC support library (32 bit Version) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: lib32gcc1-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra + Depends: BASEDEP, lib32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl lib32gcc1 + + ifenabled(`libneongcc',` +@@ -354,21 +295,14 @@ + ifenabled(`libhfgcc',` + Package: libhfgcc1 + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libhfgcc1-TARGET-dcv1 +-',`Conflicts: libgcc1-armhf [biarchhf_archs] +-')`'dnl +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (hard float ABI) ++Conflicts: libgcc1-armhf [biarchhf_archs] ++Description: GCC support library (hard float ABI) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libhfgcc1-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +@@ -376,33 +310,21 @@ + Priority: extra + Depends: BASEDEP, libhfgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Conflicts: libgcc1-dbg-armhf [biarchhf_archs] +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libhfgcc + + ifenabled(`libsfgcc',` + Package: libsfgcc1 + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libsfgcc1-TARGET-dcv1 +-',`Conflicts: libgcc1-armel [biarchsf_archs] +-')`'dnl +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (soft float ABI) ++Conflicts: libgcc1-armel [biarchsf_archs] ++Description: GCC support library (soft float ABI) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libsfgcc1-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +@@ -410,46 +332,29 @@ + Priority: extra + Depends: BASEDEP, libsfgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} + Conflicts: libgcc1-dbg-armel [biarchsf_archs] +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libsfgcc + + ifenabled(`libn32gcc',` + Package: libn32gcc1 + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libn32gcc1-TARGET-dcv1 +-',`')`'dnl + Conflicts: libgcc`'GCC_SO (<= 1:3.3-0pre9) +-Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (n32) ++Description: GCC support library (n32) + Shared version of the support library, a library of internal subroutines + that GCC uses to overcome shortcomings of particular machines, or + special needs for some languages. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libn32gcc1-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra + Depends: BASEDEP, libn32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +-Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GCC support library (debug symbols) + Debug symbols for the GCC support library. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libn32gcc + + ifdef(`TARGET', `', ` +@@ -492,7 +397,7 @@ + Recommends: ${dep:libcdev} + Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'AQ (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'AQ, libgomp`'GOMP_SO-dbg`'AQ, libitm`'ITM_SO-dbg`'AQ, libquadmath`'QMATH_SO-dbg`'AQ, libmudflap`'MF_SO-dbg`'AQ, ${dep:libcloog}, ${dep:gold} + Provides: c-compiler`'TS +-Description: GNU C compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU C compiler`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU C compiler, a fairly portable optimizing compiler for C. + ifdef(`TARGET', `dnl + . +@@ -506,7 +411,7 @@ + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${dep:libmudflapbiarch} +-Description: GNU C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU C compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU C compiler, a fairly portable optimizing compiler for C. + . + On architectures with multilib support, the package contains files +@@ -622,9 +527,9 @@ + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'AQ (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +-Provides: c++-compiler`'TS`'ifdef(`TARGET)',`',`, c++abi2-dev') ++Provides: c++-compiler`'TS`'ifdef(`TARGET',`',`, c++abi2-dev') + Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libstdc++CXX_SO`'PV-dbg`'AQ +-Description: GNU C++ compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU C++ compiler`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + ifdef(`TARGET', `dnl + . +@@ -638,7 +543,7 @@ + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libcxxbiarch}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${dep:libcxxbiarchdbg} +-Description: GNU C++ compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU C++ compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + . + On architectures with multilib support, the package contains files +@@ -651,12 +556,13 @@ + ifenabled(`libmudf',` + Package: libmudflap`'MF_SO + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-')`Provides: libmudflap'MF_SO`-armel [armel], libmudflap'MF_SO`-armhf [armhf]') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++')`'dnl ++Provides: libmudflap'MF_SO`-armel [armel], libmudflap'MF_SO`-armhf [armhf] ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: GCC mudflap shared support libraries + The libmudflap libraries are used by GCC for instrumenting pointer and array +@@ -664,8 +570,8 @@ + + Package: libmudflap`'MF_SO-dbg + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-')`Provides: libmudflap'MF_SO`-dbg-armel [armel], libmudflap'MF_SO`-dbg-armhf [armhf]') ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') ++Provides: libmudflap'MF_SO`-dbg-armel [armel], libmudflap'MF_SO`-dbg-armhf [armhf] + Section: debug + Priority: extra + Depends: BASEDEP, libmudflap`'MF_SO (= ${gcc:Version}), ${misc:Depends} +@@ -675,8 +581,8 @@ + + Package: lib32mudflap`'MF_SO + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Replaces: libmudflap0 (<< 4.1) + Conflicts: ${confl:lib32} +@@ -695,8 +601,8 @@ + + Package: lib64mudflap`'MF_SO + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Replaces: libmudflap0 (<< 4.1) + Description: GCC mudflap shared support libraries (64bit) +@@ -714,8 +620,8 @@ + + Package: libn32mudflap`'MF_SO + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Replaces: libmudflap0 (<< 4.1) + Description: GCC mudflap shared support libraries (n32) +@@ -734,8 +640,8 @@ + ifenabled(`libhfmudflap',` + Package: libhfmudflap`'MF_SO + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Section: libs ++Priority: PRI(optional) + Conflicts: libmudflap`'MF_SO`'-armhf [biarchhf_archs] + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC mudflap shared support libraries (hard float) +@@ -756,8 +662,8 @@ + ifenabled(`libsfmudflap',` + Package: libsfmudflap`'MF_SO + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libmudflap`'MF_SO`'-armel [biarchsf_archs] + Description: GCC mudflap shared support libraries (soft float) +@@ -778,8 +684,8 @@ + + Package: libmudflap`'MF_SO`'PV-dev + Architecture: ifdef(`TARGET',`TARGET',`any') +-Section: ifdef(`TARGET',`devel',`libdevel') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Section: libdevel ++Priority: PRI(optional) + Depends: BASEDEP, libmudflap`'MF_SO (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${sug:libmudflapdev} + Conflicts: libmudflap0-dev +@@ -863,13 +769,14 @@ + + ifenabled(`libgomp',` + Package: libgomp`'GOMP_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-')`Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf]') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++')`'dnl ++Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf] ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers +@@ -880,16 +787,16 @@ + Section: debug + Priority: extra + Depends: BASEDEP, libgomp`'GOMP_SO (= ${gcc:Version}), ${misc:Depends} +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-')`Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf]') ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') ++Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf] + Description: GCC OpenMP (GOMP) support library (debug symbols) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers + in the GNU Compiler Collection. + + Package: lib32gomp`'GOMP_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: GCC OpenMP (GOMP) support library (32bit) +@@ -906,9 +813,9 @@ + in the GNU Compiler Collection. + + Package: lib64gomp`'GOMP_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (64bit) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers +@@ -924,9 +831,9 @@ + in the GNU Compiler Collection. + + Package: libn32gomp`'GOMP_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC OpenMP (GOMP) support library (n32) + GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers +@@ -942,9 +849,9 @@ + + ifenabled(`libhfgomp',` + Package: libhfgomp`'GOMP_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-armhf [biarchhf_archs] + Description: GCC OpenMP (GOMP) support library (hard float ABI) +@@ -963,9 +870,9 @@ + + ifenabled(`libsfgomp',` + Package: libsfgomp`'GOMP_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgomp'GOMP_SO`-armel [biarchsf_archs] + Description: GCC OpenMP (GOMP) support library (soft float ABI) +@@ -999,12 +906,13 @@ + + ifenabled(`libitm',` + Package: libitm`'ITM_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++')`'dnl ++Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf] ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library + GNU Transactional Memory Library (libitm) provides transaction support for +@@ -1016,17 +924,17 @@ + Section: debug + Priority: extra + Depends: BASEDEP, libitm`'ITM_SO (= ${gcc:Version}), ${misc:Depends} +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-')`Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf]') ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') ++Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf] + Description: GNU Transactional Memory Library (debug symbols) + GNU Transactional Memory Library (libitm) provides transaction support for + accesses to the memory of a process, enabling easy-to-use synchronization of + accesses to shared memory by several threads. + + Package: lib32itm`'ITM_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: GNU Transactional Memory Library (32bit) +@@ -1045,9 +953,9 @@ + accesses to shared memory by several threads. + + Package: lib64itm`'ITM_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (64bit) + GNU Transactional Memory Library (libitm) provides transaction support for +@@ -1065,9 +973,9 @@ + accesses to shared memory by several threads. + + Package: libn32itm`'ITM_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (n32) + GNU Transactional Memory Library (libitm) provides transaction support for +@@ -1086,9 +994,9 @@ + + ifenabled(`libhfitm',` + Package: libhfitm`'ITM_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libitm'ITM_SO`-armhf [biarchhf_archs] + Description: GNU Transactional Memory Library (hard float ABI) +@@ -1110,9 +1018,9 @@ + + ifenabled(`libsfitm',` + Package: libsfitm`'ITM_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GNU Transactional Memory Library (soft float ABI) + GNU Transactional Memory Library (libitm) provides transaction support for +@@ -1148,12 +1056,12 @@ + + ifenabled(`libqmath',` + Package: libquadmath`'QMATH_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++')`'dnl ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library + A library, which provides quad-precision mathematical functions on targets +@@ -1165,16 +1073,15 @@ + Section: debug + Priority: extra + Depends: BASEDEP, libquadmath`'QMATH_SO (= ${gcc:Version}), ${misc:Depends} +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-'))`'dnl ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') + Description: GCC Quad-Precision Math Library (debug symbols) + A library, which provides quad-precision mathematical functions on targets + supporting the __float128 datatype. + + Package: lib32quadmath`'QMATH_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: GCC Quad-Precision Math Library (32bit) +@@ -1192,9 +1099,9 @@ + supporting the __float128 datatype. + + Package: lib64quadmath`'QMATH_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (64bit) + A library, which provides quad-precision mathematical functions on targets +@@ -1211,9 +1118,9 @@ + supporting the __float128 datatype. + + Package: libn32quadmath`'QMATH_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (n32) + A library, which provides quad-precision mathematical functions on targets +@@ -1231,9 +1138,9 @@ + + ifenabled(`libhfqmath',` + Package: libhfquadmath`'QMATH_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (hard float ABI) + A library, which provides quad-precision mathematical functions on targets +@@ -1252,9 +1159,9 @@ + + ifenabled(`libsfqmath',` + Package: libsfquadmath`'QMATH_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: GCC Quad-Precision Math Library (soft float ABI) + A library, which provides quad-precision mathematical functions on targets +@@ -1321,7 +1228,7 @@ + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}, ${misc:Depends} +-Description: GNU Objective-C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU Objective-C compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU Objective-C compiler, which compiles Objective-C on platforms + supported by the gcc compiler. + . +@@ -1332,13 +1239,14 @@ + + ifenabled(`libobjc',` + Package: libobjc`'OBJC_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + ifelse(OBJC_SO,`2',`Breaks: ${multiarch:breaks} +-',`')')`Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf]') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++',`')')`'dnl ++Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf] ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications + Library needed for GNU ObjC applications linked against the shared library. +@@ -1346,8 +1254,9 @@ + Package: libobjc`'OBJC_SO-dbg + Section: debug + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-')`Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf]') ++ifdef(`MULTIARCH', `Multi-Arch: same ++')`'dnl ++Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf] + Priority: extra + Depends: BASEDEP, libobjc`'OBJC_SO (= ${gcc:Version}), libgcc`'GCC_SO-dbg, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (debug symbols) +@@ -1356,9 +1265,9 @@ + + ifenabled(`lib64objc',` + Package: lib64objc`'OBJC_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (64bit) + Library needed for GNU ObjC applications linked against the shared library. +@@ -1374,9 +1283,9 @@ + + ifenabled(`lib32objc',` + Package: lib32objc`'OBJC_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: Runtime library for GNU Objective-C applications (32bit) +@@ -1393,9 +1302,9 @@ + + ifenabled(`libn32objc',` + Package: libn32objc`'OBJC_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Objective-C applications (n32) + Library needed for GNU ObjC applications linked against the shared library. +@@ -1411,9 +1320,9 @@ + + ifenabled(`libhfobjc',` + Package: libhfobjc`'OBJC_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-armhf [biarchhf_archs] + Description: Runtime library for GNU Objective-C applications (hard float ABI) +@@ -1431,9 +1340,9 @@ + + ifenabled(`libsfobjc',` + Package: libsfobjc`'OBJC_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Priority: ifdef(`TARGET',`extra',`PRI(optional)') ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libobjc'OBJC_SO`-armel [biarchsf_archs] + Description: Runtime library for GNU Objective-C applications (soft float ABI) +@@ -1483,7 +1392,7 @@ + Section: devel + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, gfortran`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libgfortranbiarch}, ${shlibs:Depends}, ${misc:Depends} +-Description: GNU Fortran compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU Fortran compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU Fortran compiler, which compiles Fortran on platforms + supported by the gcc compiler. + . +@@ -1504,13 +1413,14 @@ + + ifenabled(`libgfortran',` + Package: libgfortran`'FORTRAN_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-')`Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf]') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++')`'dnl ++Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf] ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications + Library needed for GNU Fortran applications linked against the +@@ -1519,8 +1429,8 @@ + Package: libgfortran`'FORTRAN_SO-dbg + Section: debug + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-')`Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf]') ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') ++Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf] + Priority: extra + Depends: BASEDEP, libgfortran`'FORTRAN_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Fortran applications (debug symbols) +@@ -1530,9 +1440,9 @@ + + ifenabled(`lib64gfortran',` + Package: lib64gfortran`'FORTRAN_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications (64bit) + Library needed for GNU Fortran applications linked against the +@@ -1550,9 +1460,9 @@ + + ifenabled(`lib32gfortran',` + Package: lib32gfortran`'FORTRAN_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: Runtime library for GNU Fortran applications (32bit) +@@ -1571,9 +1481,9 @@ + + ifenabled(`libn32gfortran',` + Package: libn32gfortran`'FORTRAN_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Fortran applications (n32) + Library needed for GNU Fortran applications linked against the +@@ -1591,9 +1501,9 @@ + + ifenabled(`libhfgfortran',` + Package: libhfgfortran`'FORTRAN_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-armhf [biarchhf_archs] + Description: Runtime library for GNU Fortran applications (hard float ABI) +@@ -1613,9 +1523,9 @@ + + ifenabled(`libsfgfortran',` + Package: libsfgfortran`'FORTRAN_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: libgfortran'FORTRAN_SO`-armel [biarchsf_archs] + Description: Runtime library for GNU Fortran applications (soft float ABI) +@@ -1671,7 +1581,7 @@ + Priority: ifdef(`TARGET',`extra',`PRI(optional)') + Depends: BASEDEP, gccgo`'PV`'TS (= ${gcc:Version}), ifdef(`STANDALONEGO',,`gcc`'PV-multilib`'TS (= ${gcc:Version}), ')${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends} + Suggests: ${dep:libgobiarchdbg} +-Description: GNU Go compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') ++Description: GNU Go compiler (multilib files)`'ifdef(`TARGET',` (cross compiler for TARGET architecture)', `') + This is the GNU Go compiler, which compiles Go on platforms supported + by the gcc compiler. + . +@@ -1692,12 +1602,13 @@ + + ifenabled(`libggo',` + Package: libgo`'GO_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-')`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++')`'dnl ++Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf] ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications + Library needed for GNU Go applications linked against the +@@ -1706,8 +1617,8 @@ + Package: libgo`'GO_SO-dbg + Section: debug + Architecture: ifdef(`TARGET',`TARGET',`any') +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +-')`Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf]') ++ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') ++Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf] + Priority: extra + Depends: BASEDEP, libgo`'GO_SO (= ${gcc:Version}), ${misc:Depends} + Description: Runtime library for GNU Go applications (debug symbols) +@@ -1717,9 +1628,9 @@ + + ifenabled(`lib64go',` + Package: lib64go`'GO_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications (64bit) + Library needed for GNU Go applications linked against the +@@ -1737,9 +1648,9 @@ + + ifenabled(`lib32go',` + Package: lib32go`'GO_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} + Description: Runtime library for GNU Go applications (32bit) +@@ -1758,9 +1669,9 @@ + + ifenabled(`libn32go',` + Package: libn32go`'GO_SO +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Priority: PRI(optional) + Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} + Description: Runtime library for GNU Go applications (n32) + Library needed for GNU Go applications linked against the +@@ -1980,136 +1891,96 @@ + ifenabled(`libcxx',` + Package: libstdc++CXX_SO + Architecture: ifdef(`TARGET',`TARGET',`any') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(important)) ++Section: libs ++Priority: PRI(important) + Depends: BASEDEP, ${dep:libc}, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1', + ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support + Breaks: ${multiarch:breaks} +-')`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]') ++')`'dnl ++Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf] + Conflicts: scim (<< 1.4.2-1) +-Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 + This package contains an additional runtime library for C++ programs + built with the GNU compiler. + . + libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which + was included up to g++-2.95. The first version of libstdc++-v3 appeared + in g++-3.0. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libcxx + + ifenabled(`lib32cxx',` + Package: lib32stdc++CXX_SO + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') +-Section: ifdef(`TARGET',`devel',`libs') ++Section: libs + Priority: extra + Depends: BASEDEP, lib32gcc1, ${shlibs:Depends}, ${misc:Depends} + Conflicts: ${confl:lib32} +-ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-TARGET-dcv1 +-',`')`'dnl + Description: GNU Standard C++ Library v3 (32 bit Version) + This package contains an additional runtime library for C++ programs + built with the GNU compiler. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl lib32cxx + + ifenabled(`lib64cxx',` + Package: lib64stdc++CXX_SO + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, lib64gcc1, ${misc:Depends} +-ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-TARGET-dcv1 +-',`')`'dnl +-Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (64bit) ++Description: GNU Standard C++ Library v3 (64bit) + This package contains an additional runtime library for C++ programs + built with the GNU compiler. + . + libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which + was included up to g++-2.95. The first version of libstdc++-v3 appeared + in g++-3.0. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl lib64cxx + + ifenabled(`libn32cxx',` + Package: libn32stdc++CXX_SO + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, libn32gcc1, ${misc:Depends} +-ifdef(`TARGET',`Provides: libn32stdc++CXX_SO-TARGET-dcv1 +-',`')`'dnl +-Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (n32) ++Description: GNU Standard C++ Library v3 (n32) + This package contains an additional runtime library for C++ programs + built with the GNU compiler. + . + libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which + was included up to g++-2.95. The first version of libstdc++-v3 appeared + in g++-3.0. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libn32cxx + + ifenabled(`libhfcxx',` + Package: libhfstdc++CXX_SO + Architecture: ifdef(`TARGET',`TARGET',`biarchhf_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, libhfgcc1, ${misc:Depends} +-ifdef(`TARGET',`Provides: libhfstdc++CXX_SO-TARGET-dcv1 +-',`')`'dnl + Conflicts: libstdc++'CXX_SO`-armhf [biarchhf_archs] +-Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (hard float ABI) ++Description: GNU Standard C++ Library v3 (hard float ABI) + This package contains an additional runtime library for C++ programs + built with the GNU compiler. + . + libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which + was included up to g++-2.95. The first version of libstdc++-v3 appeared + in g++-3.0. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libhfcxx + + ifenabled(`libsfcxx',` + Package: libsfstdc++CXX_SO + Architecture: ifdef(`TARGET',`TARGET',`biarchsf_archs') +-Section: ifdef(`TARGET',`devel',`libs') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libs ++Priority: PRI(optional) + Depends: BASEDEP, ${shlibs:Depends}, libsfgcc1, ${misc:Depends} +-ifdef(`TARGET',`Provides: libsfstdc++CXX_SO-TARGET-dcv1 +-',`')`'dnl + Conflicts: libstdc++'CXX_SO`-armel [biarchsf_archs] +-Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (soft float ABI) ++Description: GNU Standard C++ Library v3 (soft float ABI) + This package contains an additional runtime library for C++ programs + built with the GNU compiler. + . + libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which + was included up to g++-2.95. The first version of libstdc++-v3 appeared + in g++-3.0. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libsfcxx + + ifenabled(`libneoncxx',` +@@ -2129,117 +2000,75 @@ + ifenabled(`c++dev',` + Package: libstdc++CXX_SO`'PV-dev + Architecture: ifdef(`TARGET',`TARGET',`any') +-Section: ifdef(`TARGET',`devel',`libdevel') +-Priority: ifdef(`TARGET',`extra',PRI(optional)) ++Section: libdevel ++Priority: PRI(optional) + ifdef(`MULTIARCH', `Multi-Arch: same + ')`'dnl + Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} +-ifdef(`TARGET',`',`dnl native + Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev + Suggests: libstdc++CXX_SO`'PV-doc +-')`'dnl native +-Provides: libstdc++-dev`'ifdef(`TARGET',`, libstdc++-dev-TARGET-dcv1, libstdc++CXX_SO-dev-TARGET-dcv1') +-Description: GNU Standard C++ Library v3 (development files)`'ifdef(`TARGET)',` (TARGET)', `') ++Provides: libstdc++-dev ++Description: GNU Standard C++ Library v3 (development files) + This package contains the headers and static library files necessary for + building C++ programs which use libstdc++. + . + libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which + was included up to g++-2.95. The first version of libstdc++-v3 appeared + in g++-3.0. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libstdc++CXX_SO`'PV-pic + Architecture: ifdef(`TARGET',`TARGET',`any') +-Section: ifdef(`TARGET',`devel',`libdevel') ++Section: libdevel + Priority: extra + Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), ${misc:Depends} +-ifdef(`TARGET',`Provides: libstdc++CXX_SO-pic-TARGET-dcv1 +-',`')`'dnl +-Description: GNU Standard C++ Library v3 (shared library subset kit)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (shared library subset kit) + This is used to develop subsets of the libstdc++ shared libraries for + use on custom installation floppies and in embedded systems. + . + Unless you are making one of those, you will not need this package. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libstdc++CXX_SO`'PV-dbg + Architecture: ifdef(`TARGET',`TARGET',`any') + Section: debug + Priority: extra + Depends: BASEDEP, libstdc++CXX_SO (>= ${gcc:Version}), libgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1',`dnl + ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') +-Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]dnl +-') ++Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf] + Recommends: libstdc++CXX_SO`'PV-dev (= ${gcc:Version}) + Conflicts: libstdc++5-dbg, libstdc++5-3.3-dbg, libstdc++6-dbg, libstdc++6-4.0-dbg, libstdc++6-4.1-dbg, libstdc++6-4.2-dbg, libstdc++6-4.3-dbg, libstdc++6-4.4-dbg, libstdc++6-4.5-dbg, libstdc++6-4.6-dbg +-Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (debugging files) + This package contains the shared library of libstdc++ compiled with + debugging symbols. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: lib32stdc++CXX_SO`'PV-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarch32_archs') + Section: debug + Priority: extra + Depends: BASEDEP, lib32stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-dbg-TARGET-dcv1 +-',`')`'dnl + Conflicts: lib32stdc++6-dbg, lib32stdc++6-4.0-dbg, lib32stdc++6-4.1-dbg, lib32stdc++6-4.2-dbg, lib32stdc++6-4.3-dbg, lib32stdc++6-4.4-dbg, lib32stdc++6-4.5-dbg, lib32stdc++6-4.6-dbg +-Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (debugging files) + This package contains the shared library of libstdc++ compiled with + debugging symbols. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: lib64stdc++CXX_SO`'PV-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarch64_archs') + Section: debug + Priority: extra + Depends: BASEDEP, lib64stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-dbg-TARGET-dcv1 +-',`')`'dnl + Conflicts: lib64stdc++6-dbg, lib64stdc++6-4.0-dbg, lib64stdc++6-4.1-dbg, lib64stdc++6-4.2-dbg, lib64stdc++6-4.3-dbg, lib64stdc++6-4.4-dbg, lib64stdc++6-4.5-dbg, lib64stdc++6-4.6-dbg +-Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (debugging files) + This package contains the shared library of libstdc++ compiled with + debugging symbols. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + Package: libn32stdc++CXX_SO`'PV-dbg + Architecture: ifdef(`TARGET',`TARGET',`biarchn32_archs') + Section: debug + Priority: extra + Depends: BASEDEP, libn32stdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libn32gcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libn32stdc++CXX_SO-dbg-TARGET-dcv1 +-',`')`'dnl + Conflicts: libn32stdc++6-dbg, libn32stdc++6-4.0-dbg, libn32stdc++6-4.1-dbg, libn32stdc++6-4.2-dbg, libn32stdc++6-4.3-dbg, libn32stdc++6-4.4-dbg, libn32stdc++6-4.5-dbg, libn32stdc++6-4.6-dbg +-Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (debugging files) + This package contains the shared library of libstdc++ compiled with + debugging symbols. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + + ifenabled(`libhfdbgcxx',` + Package: libhfstdc++CXX_SO`'PV-dbg +@@ -2247,17 +2076,10 @@ + Section: debug + Priority: extra + Depends: BASEDEP, libhfstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libhfgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libhfstdc++CXX_SO-dbg-TARGET-dcv1 +-',`')`'dnl + Conflicts: libhfstdc++6-dbg, libhfstdc++6-4.3-dbg, libhfstdc++6-4.4-dbg, libhfstdc++6-4.5-dbg, libhfstdc++6-4.6-dbg, libstdc++'CXX_SO`-armhf [biarchhf_archs] +-Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (debugging files) + This package contains the shared library of libstdc++ compiled with + debugging symbols. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libhfdbgcxx + + ifenabled(`libsfdbgcxx',` +@@ -2266,17 +2088,10 @@ + Section: debug + Priority: extra + Depends: BASEDEP, libsfstdc++CXX_SO (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev (= ${gcc:Version}), libsfgcc`'GCC_SO-dbg, ${shlibs:Depends}, ${misc:Depends} +-ifdef(`TARGET',`Provides: libsfstdc++CXX_SO-dbg-TARGET-dcv1 +-',`')`'dnl + Conflicts: libsfstdc++6-dbg, libsfstdc++6-4.3-dbg, libsfstdc++6-4.4-dbg, libsfstdc++6-4.5-dbg, libsfstdc++6-4.6-dbg, libstdc++'CXX_SO`-armel [biarchsf_archs] +-Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') ++Description: GNU Standard C++ Library v3 (debugging files) + This package contains the shared library of libstdc++ compiled with + debugging symbols. +-ifdef(`TARGET', `dnl +- . +- This package contains files for TARGET architecture, for use in cross-compile +- environment. +-')`'dnl + ')`'dnl libsfdbgcxx + + ifdef(`TARGET', `', ` +@@ -2332,9 +2147,9 @@ + Package: libgnat`'-GNAT_V + Section: libs + Architecture: any +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl ++')`'dnl + Priority: PRI(optional) + Depends: gnat`'PV-base (= ${gnat:Version}), ${shlibs:Depends}, ${misc:Depends} + Description: runtime for applications compiled with GNAT (shared library) +@@ -2349,9 +2164,9 @@ + Package: libgnat`'-GNAT_V-dbg + Section: debug + Architecture: any +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl ++')`'dnl + Priority: extra + Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (= ${gnat:Version}), ${misc:Depends} + Description: runtime for applications compiled with GNAT (debugging symbols) +@@ -2382,9 +2197,9 @@ + + Package: libgnatvsn`'GNAT_V + Architecture: any +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl ++')`'dnl + Priority: PRI(optional) + Section: libs + Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (= ${gnat:Version}), ${misc:Depends} +@@ -2400,9 +2215,9 @@ + + Package: libgnatvsn`'GNAT_V-dbg + Architecture: any +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl ++')`'dnl + Priority: extra + Section: debug + Depends: gnat`'PV-base (= ${gnat:Version}), libgnatvsn`'GNAT_V (= ${gnat:Version}), ${misc:Depends} +@@ -2439,9 +2254,9 @@ + + Package: libgnatprj`'GNAT_V + Architecture: any +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl ++')`'dnl + Priority: PRI(optional) + Section: libs + Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (= ${gnat:Version}), libgnatvsn`'GNAT_V (= ${gnat:Version}), ${misc:Depends} +@@ -2460,9 +2275,9 @@ + + Package: libgnatprj`'GNAT_V-dbg + Architecture: any +-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ++ifdef(`MULTIARCH', `Multi-Arch: same + Pre-Depends: multiarch-support +-'))`'dnl ++')`'dnl + Priority: extra + Section: debug + Depends: gnat`'PV-base (= ${gnat:Version}), libgnatprj`'GNAT_V (= ${gnat:Version}), ${misc:Depends} only in patch2: unchanged: --- gcc-4.7-4.7.2.orig/debian/thibgpatches/0005_Use_multiarch_paths_everywhere_when_building_cross_compilers.patch +++ gcc-4.7-4.7.2/debian/thibgpatches/0005_Use_multiarch_paths_everywhere_when_building_cross_compilers.patch @@ -0,0 +1,389 @@ +# HG changeset patch +# User Thibaut Girka +# Date 1339001620 -7200 +# Node ID 0a7ec24092d2cf5137136661e6de6b499d64e47e +# Parent a13440aa4b28f65deef82298cccf31e5ea0fddfe +Use multiarch paths everywhere when building cross-compilers + +This patch unifies native compilers and cross-compilers by using +the same multiarch paths in cross-toolchains than in native toolchains. +-- + debian/patches/cross-multiarch.diff | 306 ++++++++++++++++++++++++++++++++++++ + debian/rules.patch | 2 +- + debian/rules2 | 32 +--- + 3 files changed, 311 insertions(+), 29 deletions(-) + +diff --git a/debian/patches/cross-multiarch.diff b/debian/patches/cross-multiarch.diff +new file mode 100644 +--- /dev/null ++++ b/debian/patches/cross-multiarch.diff +@@ -0,0 +1,306 @@ ++--- a/src/boehm-gc/configure.ac +++++ b/src/boehm-gc/configure.ac ++@@ -493,14 +493,8 @@ ++ AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory]) ++ fi ++ ++-if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- toolexecdir='$(exec_prefix)/$(target_noncanonical)' ++- toolexeclibdir='$(toolexecdir)/lib' ++-else ++- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' ++- toolexeclibdir='$(libdir)' ++-fi +++toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' +++toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libada/configure.ac +++++ b/src/libada/configure.ac ++@@ -65,15 +65,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libffi/configure.ac +++++ b/src/libffi/configure.ac ++@@ -421,14 +421,9 @@ ++ AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.]) ++ fi) ++ ++-if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++-else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++-fi +++toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++toolexeclibdir='$(libdir)' +++ ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libgcc/configure.ac +++++ b/src/libgcc/configure.ac ++@@ -83,8 +83,6 @@ ++ slibdir="$with_slibdir", ++ if test "${version_specific_libs}" = yes; then ++ slibdir='$(libsubdir)' ++-elif test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then ++- slibdir='$(exec_prefix)/$(host_noncanonical)/lib' ++ else ++ slibdir='$(libdir)' ++ fi) ++@@ -129,15 +127,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_noncanonical)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libgfortran/configure.ac +++++ b/src/libgfortran/configure.ac ++@@ -98,15 +98,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libgo/configure.ac +++++ b/src/libgo/configure.ac ++@@ -77,14 +77,8 @@ ++ ++ # Calculate glibgo_toolexecdir, glibgo_toolexeclibdir ++ # Install a library built with a cross compiler in tooldir, not libdir. ++-if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- nover_glibgo_toolexecdir='${exec_prefix}/${host_alias}' ++- nover_glibgo_toolexeclibdir='${toolexecdir}/lib' ++-else ++- nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}' ++- nover_glibgo_toolexeclibdir='${libdir}' ++-fi +++nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}' +++nover_glibgo_toolexeclibdir='${libdir}' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libgomp/configure.ac +++++ b/src/libgomp/configure.ac ++@@ -76,15 +76,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libitm/configure.ac +++++ b/src/libitm/configure.ac ++@@ -89,15 +89,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libjava/configure.ac +++++ b/src/libjava/configure.ac ++@@ -1589,15 +1589,8 @@ ++ toolexeclibdir=$toolexecmainlibdir ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_noncanonical)' ++- toolexecmainlibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' ++- toolexecmainlibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' +++ toolexecmainlibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. ++--- a/src/libmudflap/configure.ac +++++ b/src/libmudflap/configure.ac ++@@ -157,15 +157,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libobjc/configure.ac +++++ b/src/libobjc/configure.ac ++@@ -116,15 +116,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_noncanonical)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libquadmath/configure.ac +++++ b/src/libquadmath/configure.ac ++@@ -93,15 +93,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libssp/configure.ac +++++ b/src/libssp/configure.ac ++@@ -170,15 +170,8 @@ ++ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ++ ;; ++ no) ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- # Install a library built with a cross compiler in tooldir, not libdir. ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++- else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++- fi +++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++ toolexeclibdir='$(libdir)' ++ multi_os_directory=`$CC -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/libstdc++-v3/acinclude.m4 +++++ b/src/libstdc++-v3/acinclude.m4 ++@@ -804,14 +804,8 @@ ++ # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir ++ # Install a library built with a cross compiler in tooldir, not libdir. ++ if test x"$glibcxx_toolexecdir" = x"no"; then ++- if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- glibcxx_toolexecdir='${exec_prefix}/${host_alias}' ++- glibcxx_toolexeclibdir='${toolexecdir}/lib' ++- else ++- glibcxx_toolexecdir='${libdir}/gcc/${host_alias}' ++- glibcxx_toolexeclibdir='${libdir}' ++- fi +++ glibcxx_toolexecdir='${libdir}/gcc/${host_alias}' +++ glibcxx_toolexeclibdir='${libdir}' ++ multi_os_directory=`$CXX -print-multi-os-directory` ++ case $multi_os_directory in ++ .) ;; # Avoid trailing /. ++--- a/src/zlib/configure.ac +++++ b/src/zlib/configure.ac ++@@ -91,14 +91,9 @@ ++ ++ AC_CHECK_HEADERS(unistd.h) ++ ++-if test -n "$with_cross_host" && ++- test x"$with_cross_host" != x"no"; then ++- toolexecdir='$(exec_prefix)/$(target_alias)' ++- toolexeclibdir='$(toolexecdir)/lib' ++-else ++- toolexecdir='$(libdir)/gcc-lib/$(target_alias)' ++- toolexeclibdir='$(libdir)' ++-fi +++toolexecdir='$(libdir)/gcc-lib/$(target_alias)' +++toolexeclibdir='$(libdir)' +++ ++ if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then ++ multiosdir=/`$CC -print-multi-os-directory` ++ case $multiosdir in +diff --git a/debian/rules.patch b/debian/rules.patch +--- a/debian/rules.patch ++++ b/debian/rules.patch +@@ -228,7 +228,7 @@ + debian_patches += arm-multilib-defaults + + ifeq ($(DEB_CROSS),yes) +- debian_patches += cross-include cross-fixes ++ debian_patches += cross-include cross-fixes cross-multiarch + endif + + ifeq ($(DEB_TARGET_ARCH_OS),hurd) +diff --git a/debian/rules2 b/debian/rules2 +--- a/debian/rules2 ++++ b/debian/rules2 +@@ -629,26 +629,11 @@ + PF = usr + endif + +-# PFL is the installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds +-ifeq ($(DEB_CROSS),yes) +- PFL = $(PF)/$(DEB_TARGET_GNU_TYPE) +-else +- PFL = $(PF) +-endif +- +-# RPF is the base prefix or installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds +-ifeq ($(DEB_CROSS),yes) +- RPF = $(PF)/$(DEB_TARGET_GNU_TYPE) +-else +- RPF = +-endif ++PFL = $(PF) ++RPF = + + ifeq ($(with_multiarch_lib),yes) +- ifeq ($(DEB_CROSS),yes) +- libdir = lib +- else +- libdir = lib/$(DEB_TARGET_MULTIARCH) +- endif ++ libdir = lib/$(DEB_TARGET_MULTIARCH) + else + libdir = lib + endif +@@ -682,16 +667,7 @@ + d_l= debian/$(p_l) + d_d= debian/$(p_d) + +-ifeq ($(DEB_CROSS),yes) +- usr_lib = $(PFL)/lib +- +- # sh4 has multilib. base is sh4-linux-gnu. See #663028. +- ifneq (,$(findstring sh4-linux,$(DEB_TARGET_GNU_TYPE))) +- usr_lib = $(PFL)/lib/sh4-linux-gnu/ +- endif +-else +- usr_lib = $(PFL)/$(libdir) +-endif ++usr_lib = $(PFL)/$(libdir) + usr_lib32 = $(PFL)/lib32 + usr_libn32 = $(PFL)/lib32 + usr_lib64 = $(PFL)/lib64