On 2017-11-05 17:40 +0100, Helmut Grohne wrote: > Package: cross-gcc-dev > Version: 154 > Tags: patch > User: helmutg@debian.org > Usertags: rebootstrap > > Hi Dima and Wookey, > > gcc-8/0008-g-include-directories-functional-again.patch has two hunks. > The first of the modifies a hunk header of g++-multiarch-incdir.diff. > That modification turns g++-multiarch-incdir.diff into a broken patch. > The first hunk should be removed. OK. Done. Seems to build a cross-gcc-8 OK The patch is attached. Not sure where the offical git repo is, so I've not attempted to update that, just the actual package in the archive. Wookey -- Principal hats: Linaro, Debian, Wookware, ARM http://wookware.org/
diff -Nru cross-gcc-154/debian/changelog cross-gcc-155/debian/changelog --- cross-gcc-154/debian/changelog 2017-10-27 06:54:25.000000000 +0100 +++ cross-gcc-155/debian/changelog 2017-11-07 03:54:51.000000000 +0000 @@ -1,3 +1,9 @@ +cross-gcc (155) unstable; urgency=medium + + * Fix corrupting gcc8 patch-patch (Closes: #880917) + + -- Wookey <wookey@debian.org> Tue, 07 Nov 2017 02:59:16 +0000 + cross-gcc (154) unstable; urgency=medium * rebuild for 8-20171023-1 diff -Nru cross-gcc-154/patches/gcc-8/0008-g-include-directories-functional-again.patch cross-gcc-155/patches/gcc-8/0008-g-include-directories-functional-again.patch --- cross-gcc-154/patches/gcc-8/0008-g-include-directories-functional-again.patch 2017-10-27 06:54:25.000000000 +0100 +++ cross-gcc-155/patches/gcc-8/0008-g-include-directories-functional-again.patch 2017-11-07 03:51:40.000000000 +0000 @@ -19,15 +19,6 @@ index dbd9b6e..583373a 100644 --- a/debian/patches/g++-multiarch-incdir.diff +++ b/debian/patches/g++-multiarch-incdir.diff -@@ -99,7 +99,7 @@ Index: b/src/gcc/incpath.c - } - add_path (str, INC_SYSTEM, p->cxx_aware, false); - } --@@ -223,7 +235,16 @@ add_standard_paths (const char *sysroot, -+@@ -223,7 +235,45 @@ add_standard_paths (const char *sysroot, - free (str); - continue; - } @@ -117,3 +117,32 @@ Index: b/src/gcc/incpath.c }
Attachment:
signature.asc
Description: PGP signature