Hi, I refresh this patch with 4.8.2-16. On Sat, Dec 28, 2013 at 10:54 AM, Yunqiang Su <wzss...@gmail.com> wrote: > Mark these libraries as multiarch is very useful when bootstrap a new > architecture with multiarch. > > -- > Yunqiang Su
-- Yunqiang Su
--- a/debian/control.m4 2014-02-20 15:23:10.000000000 +0000 +++ b/debian/control.m4 2014-02-20 15:23:34.995798441 +0000 @@ -125,7 +125,6 @@ define(`SOFTBASEDEP', `gnat`'PV-base (>= ${gnat:SoftVersion})') ') -ifdef(`TARGET', `', ` ifenabled(`gccbase',` Package: gcc`'PV-base @@ -147,7 +146,6 @@ Please use the compilers from the gcc-snapshot package for testing. ')`'dnl ')`'dnl -')`'dnl native ifenabled(`gccxbase',` dnl override default base package dependencies to cross version @@ -168,7 +166,6 @@ ')`'dnl ifenabled(`java',` -ifdef(`TARGET', `', ` ifenabled(`gcjbase',` Package: gcj`'PV-base Architecture: any @@ -182,7 +179,6 @@ This package contains files common to all java related packages built from the GNU Compiler Collection (GCC). ')`'dnl gccbase -')`'dnl native ifenabled(`gcjxbase',` dnl override default base package dependencies to cross version @@ -224,11 +220,10 @@ Section: ifdef(`TARGET',`devel',`libs') Priority: ifdef(`TARGET',`extra',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]') +')`'dnl BUILT_USING`'dnl Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') Shared version of the support library, a library of internal subroutines @@ -245,11 +240,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(gcc1,,=,${gcc:EpochVersion}), ${misc:Depends} -ifdef(`TARGET',`',`dnl ifdef(`MULTIARCH',`Multi-Arch: same ')dnl -Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf] -')dnl BUILT_USING`'dnl Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') Debug symbols for the GCC support library. @@ -264,11 +256,10 @@ Section: ifdef(`TARGET',`devel',`libs') Priority: ifdef(`TARGET',`extra',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 +')`'dnl BUILT_USING`'dnl Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') Shared version of the support library, a library of internal subroutines @@ -285,8 +276,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(gcc2,,=,${gcc:Version}), ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl BUILT_USING`'dnl Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') Debug symbols for the GCC support library. @@ -304,8 +295,8 @@ Priority: optional Recommends: ${dep:libcdev} Depends: BASEDEP, ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libatomic}, ${dep:libbtrace}, ${dep:libasan}, ${dep:libtsan}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl BUILT_USING`'dnl Description: GCC support library (development files) This package contains the headers and static library files necessary for @@ -315,10 +306,10 @@ ifenabled(`lib4gcc',` Package: libgcc4`'LS Architecture: ifdef(`TARGET',`CROSS_ARCH',`hppa') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support Breaks: ${multiarch:breaks} -'))`'dnl +')`'dnl Section: ifdef(`TARGET',`devel',`libs') Priority: ifdef(`TARGET',`extra',required) Depends: ifdef(`STANDALONEJAVA',`gcj`'PV-base (>= ${gcj:Version})',`BASEDEP'), ${shlibs:Depends}, ${misc:Depends} @@ -335,8 +326,8 @@ Package: libgcc4-dbg`'LS Architecture: ifdef(`TARGET',`CROSS_ARCH',`hppa') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl Section: debug Priority: extra Depends: BASEDEP, libdep(gcc4,,=,${gcc:Version}), ${misc:Depends} @@ -661,7 +652,6 @@ ')`'dnl x32dev ')`'dnl cdev -ifdef(`TARGET', `', ` ifenabled(`libgmath',` Package: libgccmath`'GCCMATH_SO`'LS Architecture: i386 @@ -693,7 +683,6 @@ Description: GCC math support library (64bit) Support library for GCC. ')`'dnl -')`'dnl native ifenabled(`cdev',` Package: gcc`'PV`'TS @@ -838,7 +827,6 @@ ')`'dnl c++dev ')`'dnl c++ -ifdef(`TARGET', `', ` ifenabled(`ssp',` Package: libssp`'SSP_SO`'LS Architecture: any @@ -925,16 +913,15 @@ The protection is realized by buffer overflow detection and reordering of stack variables to avoid pointer corruption. ')`'dnl -')`'dnl native ifenabled(`libgomp',` Package: libgomp`'GOMP_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`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]') +')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -947,8 +934,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(gomp`'GOMP_SO,,=), ${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 BUILT_USING`'dnl Description: GCC OpenMP (GOMP) support library (debug symbols) GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers @@ -1101,9 +1088,9 @@ Package: libitm`'ITM_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`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]') +')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -1117,8 +1104,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(itm`'ITM_SO,,=), ${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 BUILT_USING`'dnl Description: GNU Transactional Memory Library (debug symbols) GNU Transactional Memory Library (libitm) provides transaction support for @@ -1287,9 +1274,9 @@ Package: libatomic`'ATOMIC_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -')`Provides: libatomic'ATOMIC_SO`-armel [armel], libatomic'ATOMIC_SO`-armhf [armhf]') +')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -1302,8 +1289,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(atomic`'ATOMIC_SO,,=), ${misc:Depends} -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same -')`Provides: libatomic'ATOMIC_SO`-dbg-armel [armel], libatomic'ATOMIC_SO`-dbg-armhf [armhf]') +ifdef(`MULTIARCH', `Multi-Arch: same +')dnl BUILT_USING`'dnl Description: support library providing __atomic built-in functions (debug symbols) library providing __atomic built-in functions. When an atomic call cannot @@ -1458,9 +1445,9 @@ Package: libasan`'ASAN_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -')`Provides: libasan'ASAN_SO`-armel [armel], libasan'ASAN_SO`-armhf [armhf]') +')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -1473,8 +1460,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(asan`'ASAN_SO,,=), ${misc:Depends} -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same -')`Provides: libasan'ASAN_SO`-dbg-armel [armel], libasan'ASAN_SO`-dbg-armhf [armhf]') +ifdef(`MULTIARCH', `Multi-Arch: same +')dnl BUILT_USING`'dnl Description: AddressSanitizer -- a fast memory error detector (debug symbols) AddressSanitizer (ASan) is a fast memory error detector. It finds @@ -1629,9 +1616,9 @@ Package: libtsan`'TSAN_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -')`Provides: libtsan'TSAN_SO`-armel [armel], libtsan'TSAN_SO`-armhf [armhf]') +')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -1644,8 +1631,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(tsan`'TSAN_SO,,=), ${misc:Depends} -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same -')`Provides: libtsan'TSAN_SO`-dbg-armel [armel], libtsan'TSAN_SO`-dbg-armhf [armhf]') +ifdef(`MULTIARCH', `Multi-Arch: same +')dnl BUILT_USING`'dnl Description: ThreadSanitizer -- a Valgrind-based detector of data races (debug symbols) ThreadSanitizer (Tsan) is a data race detector for C/C++ programs. @@ -1804,9 +1791,9 @@ Package: libbacktrace`'BTRACE_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -')`Provides: libbacktrace'BTRACE_SO`-armel [armel], libbacktrace'BTRACE_SO`-armhf [armhf]') +')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -1819,8 +1806,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(backtrace`'BTRACE_SO,,=), ${misc:Depends} -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same -')`Provides: libbacktrace'BTRACE_SO`-dbg-armel [armel], libbacktrace'BTRACE_SO`-dbg-armhf [armhf]') +ifdef(`MULTIARCH', `Multi-Arch: same +')dnl BUILT_USING`'dnl Description: stack backtrace library (debug symbols) libbacktrace uses the GCC unwind interface to collect a stack trace, @@ -1976,9 +1963,9 @@ Package: libquadmath`'QMATH_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -'))`'dnl +')`'dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -1992,8 +1979,8 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(quadmath`'QMATH_SO,,=), ${misc:Depends} -ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl BUILT_USING`'dnl Description: GCC Quad-Precision Math Library (debug symbols) A library, which provides quad-precision mathematical functions on targets @@ -2199,8 +2186,8 @@ Section: libdevel Priority: optional Depends: BASEDEP, libdevdep(gcc`'PV-dev,), libdep(objc`'OBJC_SO,), ${shlibs:Depends}, ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl BUILT_USING`'dnl Description: Runtime library for GNU Objective-C applications (development files) This package contains the headers and static library files needed to build @@ -2277,10 +2264,10 @@ Package: libobjc`'OBJC_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`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]') +',`')')dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -2290,8 +2277,8 @@ Package: libobjc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`CROSS_ARCH',`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 Priority: extra Depends: BASEDEP, libdep(objc`'OBJC_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends} BUILT_USING`'dnl @@ -2483,8 +2470,8 @@ Section: ifdef(`TARGET',`devel',`libdevel') Priority: optional Depends: BASEDEP, libdevdep(gcc`'PV-dev`',), libdep(gfortran`'FORTRAN_SO,), ${shlibs:Depends}, ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl BUILT_USING`'dnl Description: Runtime library for GNU Fortran applications (development files) This package contains the headers and static library files needed to build @@ -2561,10 +2548,10 @@ Package: libgfortran`'FORTRAN_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`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]') +')dnl Priority: ifdef(`TARGET',`extra',PRI(optional)) Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} BUILT_USING`'dnl @@ -2575,8 +2562,8 @@ Package: libgfortran`'FORTRAN_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`CROSS_ARCH',`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 Priority: extra Depends: BASEDEP, libdep(gfortran`'FORTRAN_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends} BUILT_USING`'dnl @@ -2787,9 +2774,9 @@ Package: libgo`'GO_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`CROSS_ARCH',`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]') +')dnl Priority: ifdef(`TARGET',`extra',PRI(optional)) Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} Replaces: libgo3`'LS @@ -2801,8 +2788,8 @@ Package: libgo`'GO_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`CROSS_ARCH',`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 Priority: extra Depends: BASEDEP, libdep(go`'GO_SO,,=), ${misc:Depends} BUILT_USING`'dnl @@ -3152,11 +3139,10 @@ Section: ifdef(`TARGET',`devel',`libs') Priority: ifdef(`TARGET',`extra',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 Conflicts: scim (<< 1.4.2-1) BUILT_USING`'dnl Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') @@ -3328,8 +3314,8 @@ ifenabled(`c++dev',` Package: libstdc++`'PV-dev`'LS Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl Section: ifdef(`TARGET',`devel',`libdevel') Priority: ifdef(`TARGET',`extra',PRI(optional)) Depends: BASEDEP, libdevdep(gcc`'PV-dev,,=), libdep(stdc++CXX_SO,,>=), ${dep:libcdev}, ${misc:Depends} @@ -3354,8 +3340,8 @@ Package: libstdc++`'PV-pic`'LS Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -'))`'dnl +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl Section: ifdef(`TARGET',`devel',`libdevel') Priority: extra Depends: BASEDEP, libdep(stdc++CXX_SO,), libdevdep(stdc++`'PV-dev,), ${misc:Depends} @@ -3378,10 +3364,7 @@ Section: debug Priority: extra Depends: BASEDEP, libdep(stdc++CXX_SO,), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${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: libdevdep(stdc++`'PV-dev,) 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, libstdc++6-4.7-dbg`'LS BUILT_USING`'dnl