Bug#880917: cross-gcc-dev: gcc-8/0008-g-include-directories-functional-again.patch: broken patch

[Dima Kogan]

Wookey  writes:

>> 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.

Thanks for taking care of it. I need a few days to integrate it into the
repo.

Bug#880917: cross-gcc-dev: gcc-8/0008-g-include-directories-functional-again.patch: broken patch

[Wookey]

On 2017-11-05 17:40 +0100, Helmut Grohne wrote:
> Package: cross-gcc-dev
> Version: 154
> Tags: patch
> User: helm...@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.0 +0100
+++ cross-gcc-155/debian/changelog	2017-11-07 03:54:51.0 +
@@ -1,3 +1,9 @@
+cross-gcc (155) unstable; urgency=medium
+
+  * Fix corrupting gcc8 patch-patch (Closes: #880917)
+
+ -- Wookey   Tue, 07 Nov 2017 02:59:16 +
+
 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.0 +0100
+++ cross-gcc-155/patches/gcc-8/0008-g-include-directories-functional-again.patch	2017-11-07 03:51:40.0 +
@@ -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
   	}
   


signature.asc
Description: PGP signature

Bug#880917: cross-gcc-dev: gcc-8/0008-g-include-directories-functional-again.patch: broken patch

[Helmut Grohne]

Package: cross-gcc-dev
Version: 154
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Hi Dima and Wookey,

thanks for maintaining cross-gcc-dev. I noticed while the present gcc-8
patches do apply against gcc-8, they end up breaking
g++-multiarch-incdir.diff.
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. The following command nullifies it:

sed -i -e '/^+@@ -223,7 +235,45 @@/s/45/16/' 
patches/gcc-8/0008-g-include-directories-functional-again.patch

After doing so, I can bootstrap gcc-8 for some architectures.

Helmut