.oO( Third time is the charm? ) Cyril Brulebois <k...@debian.org> (2017-08-24): > Michael Biebl <bi...@debian.org> (2017-08-24): > > Am 23.08.2017 um 23:57 schrieb Cyril Brulebois: > > > > > My NMU FTBFSes on mips64el: > > > > > > https://buildd.debian.org/status/fetch.php?pkg=systemd&arch=mips64el&ver=234-2.1&stamp=1503523165&raw=0 > > > > > > James Cowgill mentioned this gcc bug report: > > > https://bugs.debian.org/871514 > > > > > > so I think I might duplicate the rules file in src:debian-installer and > > > work around the missing file by putting it into place manually, which is > > > somewhat ugly but means we're no longer blocking on the systemd update. > > > > I wouldn't mind if you forced the compiler to be GCC 6 in src:systemd > > until this bug is fixed. > > The attached patch seems to do the trick, will upload after a full build > inside sbuild, then open a bug report as you suggested on IRC, so that > you think about reverting this when the gcc-7 bug is fixed.
I initially meant to add g++ and CXX and should have, but it seemed not to be needed… until it failed on buildds since there are checks building in c++ mode; which I didn't catch locally because the wrong chroot has been used while build testing… Sorry for that. Hopefully attaching the last debdiff… KiBi.
diff -Nru systemd-234/debian/changelog systemd-234/debian/changelog --- systemd-234/debian/changelog 2017-08-24 00:53:09.000000000 +0200 +++ systemd-234/debian/changelog 2017-08-24 02:45:13.000000000 +0200 @@ -1,3 +1,12 @@ +systemd (234-2.3) unstable; urgency=high + + * Non-maintainer upload. + * Also switch to g++-6 temporarily (needed for some tests): + - Add g++-6 to Build-Depends + - Export CXX = g++-6 + + -- Cyril Brulebois <k...@debian.org> Thu, 24 Aug 2017 02:40:53 +0200 + systemd (234-2.2) unstable; urgency=high * Non-maintainer upload. diff -Nru systemd-234/debian/control systemd-234/debian/control --- systemd-234/debian/control 2017-08-24 00:45:38.000000000 +0200 +++ systemd-234/debian/control 2017-08-24 02:27:16.000000000 +0200 @@ -54,6 +54,7 @@ libcap2-bin <!nocheck>, iproute2 <!nocheck>, gcc-6, + g++-6, Package: systemd Architecture: linux-any diff -Nru systemd-234/debian/rules systemd-234/debian/rules --- systemd-234/debian/rules 2017-08-24 00:45:44.000000000 +0200 +++ systemd-234/debian/rules 2017-08-24 02:28:10.000000000 +0200 @@ -5,6 +5,7 @@ export LC_ALL = C.UTF-8 export CC = gcc-6 +export CXX = g++-6 include /usr/share/dpkg/default.mk
signature.asc
Description: Digital signature