Bug#936092: gcc-9 patches apply even less

Helmut Grohne <[email protected]> Fri, 30 Aug 2019 06:52:40 +0200

Newsgroups	gmane.linux.debian.devel.toolchain
Message-ID	<20190830045239.GA1019__4000.54792860232$1567141049$gmane$org@alf.mars>

Source: cross-gcc
Version: 231
Severity: serious
Tags: patch
Control: block -1 by 928035

On top of #928035, there is another change in gcc-9 that makes the gcc-9
patches no longer apply. The attached patch resolves the relevant hunk.
Please consider uploading a new version that works with the current
gcc-9.

Helmut

patch (text/plain, 378 B)

--- a/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch
+++ b/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch
@@ -368,9 +388,9 @@
 +  else
 +    debian_patches += cross-install-location
 +  endif
- endif
- 
- ifeq ($(DEB_TARGET_ARCH_OS),hurd)
+   ifeq ($(with_m2),yes)
+     debian_patches += cross-install-location-gm2
+   endif
 -- 
 2.17.1