On 02/04/2020 11.13, Matthias Klose wrote:
> On 4/2/20 1:30 AM, Andreas Beckmann wrote:
>> On Thu, 26 Mar 2020 21:02:59 +0100 Matthias Klose <d...@debian.org> wrote:
>>> yes, but we cannot rebuild the package, because it build-depends on gnat-8.
>>> Filed a removal bug for gcc-8 instead.
>>
>> An easy fix would probably be to temporarily add a versioned
>> Provides: libgcc-s1 (= 1:${binary:Version})
or rather libgcc1-s1 (= ${gcc:EpochVersion})
>> to libgcc-s1 in src:gcc-10 which should make libgcc-8-dev installable
>> again, s.t. gcc-8 can be rebuilt fixed.
>
> that's a good idea.
I had gcc-10 rebuilding last night with that change (see attached patch)
and just tried it in a pbuilder sid chroot.
* libgcc-8-dev was installable again
* downgrading gcc-10 to the sid version (i.e. switching again to a
version without that provides) worked as well (after removing
libgcc-8-dev first, of course).
Andreas
diff -Nru gcc-10-10-20200324/debian/changelog gcc-10-10-20200324/debian/changelog
--- gcc-10-10-20200324/debian/changelog 2020-03-24 13:38:16.000000000 +0100
+++ gcc-10-10-20200324/debian/changelog 2020-04-02 01:59:01.000000000 +0200
@@ -1,3 +1,10 @@
+gcc-10 (10-20200324-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * work around broken gcc-8 dependencies (Closes: #954826)
+
+ -- Andreas Beckmann <a...@debian.org> Thu, 02 Apr 2020 01:59:01 +0200
+
gcc-10 (10-20200324-1) unstable; urgency=medium
* GCC snapshot, taken from the trunk (20200324, 906b3eb9df6).
diff -Nru gcc-10-10-20200324/debian/control gcc-10-10-20200324/debian/control
--- gcc-10-10-20200324/debian/control 2020-03-24 13:19:44.000000000 +0100
+++ gcc-10-10-20200324/debian/control 2020-04-02 01:59:01.000000000 +0200
@@ -44,7 +44,7 @@
Section: libs
Priority: optional
Depends: gcc-10-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: libgcc1 (= ${gcc:EpochVersion}), libgcc-s1-armel [armel], libgcc-s1-armhf [armhf]
+Provides: libgcc1-s1 (= ${gcc:EpochVersion}), libgcc1 (= ${gcc:EpochVersion}), libgcc-s1-armel [armel], libgcc-s1-armhf [armhf]
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Breaks: ${libgcc:Breaks}
diff -Nru gcc-10-10-20200324/debian/control.m4 gcc-10-10-20200324/debian/control.m4
--- gcc-10-10-20200324/debian/control.m4 2020-03-20 20:41:20.000000000 +0100
+++ gcc-10-10-20200324/debian/control.m4 2020-04-02 01:59:01.000000000 +0200
@@ -206,7 +206,7 @@
Section: ifdef(`TARGET',`devel',`libs')
Priority: optional
Depends: BASELDEP, ${shlibs:Depends}, ${misc:Depends}
-Provides: libgcc1`'LS (= ${gcc:EpochVersion}), ifdef(`TARGET',`libgcc-s1-TARGET-dcv1',`libgcc-s1-armel [armel], libgcc-s1-armhf [armhf]')
+Provides: libgcc-s1 (= ${gcc:EpochVersion}), libgcc1`'LS (= ${gcc:EpochVersion}), ifdef(`TARGET',`libgcc-s1-TARGET-dcv1',`libgcc-s1-armel [armel], libgcc-s1-armhf [armhf]')
ifdef(`MULTIARCH', `Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
')`'dnl
