diff options
author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-05-11 17:30:54 +0000 |
---|---|---|
committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-05-11 17:30:54 +0000 |
commit | fbc95296976cc764353e70cc8284ad9e951c228f (patch) | |
tree | 444fd073dfe7b4cafff650c489f005e1adf91691 /debian | |
parent | f29594b9d6dc9a0e6f1924fb3a8b684c4a2c1a25 (diff) | |
download | gcc-47-fbc95296976cc764353e70cc8284ad9e951c228f.tar.gz |
* Fix libgcc-dbg dependencies on hppa and m68k. Closes: #707745.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6748 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | debian/control.m4 | 8 | ||||
-rw-r--r-- | debian/rules.conf | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index c5de726..8bec68e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gcc-4.7 (4.7.3-4) UNRELEASED; urgency=low * Remove the build dependency on locales for this upload. * Tighten build dependency on libmpc-dev to ensure using libmpc3. * Disable multilib dejagnu runs for gcj. + * Fix libgcc-dbg dependencies on hppa and m68k. Closes: #707745. [ Aurelien Jarno ] * Add build-deps on libn32gcc1 and lib64gcc1 on mips/mipsel to fix diff --git a/debian/control b/debian/control index 0a4389b..4aed8e8 100644 --- a/debian/control +++ b/debian/control @@ -95,7 +95,7 @@ Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), cpp-4.7 (= ${gcc:Version}), binutils (>= ${binutils:Version}), libgcc-4.7-dev (= ${gcc:Version}), ${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 (>= ${gcc:EpochVersion}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libquadmath0-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${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 (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libquadmath0-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold} Provides: c-compiler Description: GNU C compiler This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -551,7 +551,7 @@ Package: libstdc++6-4.7-dbg Architecture: any Section: debug Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg (>= ${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg (>= ${libgcc:Version}), ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Provides: libstdc++6-4.7-dbg-armel [armel], libstdc++6-4.7-dbg-armhf [armhf] Recommends: libstdc++6-4.7-dev (= ${gcc:Version}) diff --git a/debian/control.m4 b/debian/control.m4 index 5cdf62d..a6deabf 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -702,7 +702,7 @@ Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), libdevdep(gcc`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends} Recommends: ${dep:libcdev} -Suggests: ${gcc:multilib}, libdevdep(mudflap`'MF_SO`'PV-dev,,>=,${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libdbgdep(gcc`'GCC_SO-dbg,,>=,${gcc:EpochVersion}), libdbgdep(gomp`'GOMP_SO-dbg), libdbgdep(itm`'ITM_SO-dbg), libdbgdep(quadmath`'QMATH_SO-dbg,), libdbgdep(mudflap`'MF_SO-dbg,), ${dep:libcloog}, ${dep:gold} +Suggests: ${gcc:multilib}, libdevdep(mudflap`'MF_SO`'PV-dev,,>=,${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), libdbgdep(gomp`'GOMP_SO-dbg), libdbgdep(itm`'ITM_SO-dbg), libdbgdep(quadmath`'QMATH_SO-dbg,), libdbgdep(mudflap`'MF_SO-dbg,), ${dep:libcloog}, ${dep:gold} Provides: c-compiler`'TS BUILT_USING`'dnl Description: GNU C compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') @@ -1820,7 +1820,7 @@ 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]') Priority: extra -Depends: BASEDEP, libdep(objc`'OBJC_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${gcc:EpochVersion}), ${misc:Depends} +Depends: BASEDEP, libdep(objc`'OBJC_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends} BUILT_USING`'dnl Description: Runtime library for GNU Objective-C applications (debug symbols) Library needed for GNU ObjC applications linked against the shared library. @@ -2119,7 +2119,7 @@ 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]') Priority: extra -Depends: BASEDEP, libdep(gfortran`'FORTRAN_SO,,=), ${misc:Depends} +Depends: BASEDEP, libdep(gfortran`'FORTRAN_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends} BUILT_USING`'dnl Description: Runtime library for GNU Fortran applications (debug symbols) Library needed for GNU Fortran applications linked against the @@ -2899,7 +2899,7 @@ Package: libstdc++CXX_SO`'PV-dbg`'LS Architecture: ifdef(`TARGET',`CROSS_ARCH',`any') Section: debug Priority: extra -Depends: BASEDEP, libdep(stdc++CXX_SO,,>=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends} +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 diff --git a/debian/rules.conf b/debian/rules.conf index 186c568..9e434cd 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -869,6 +869,7 @@ copyright-file: substvars-file: rm -f debian/substvars.local.tmp ( \ + echo 'libgcc:Version=$(DEB_LIBGCC_VERSION)'; \ echo 'gcc:Version=$(DEB_GCC_VERSION)'; \ echo 'gcc:EpochVersion=$(DEB_EVERSION)'; \ echo 'gcc:SoftVersion=$(DEB_GCC_SOFT_VERSION)'; \ |