--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Control: close 925950
Please unblock package cross-gcc. Its patches failed to apply due to a
change in gcc packaging, see #925950. At the time of the filing, Dima
had already fixed it in git and added a fixed version to the bug. Tobias
Frost uploaded Dimas changes, but didn't close the bug. Closing it now.
The diff is not quite as trivial, but it mostly changes commit ids and
line numbers in patches. The crucial change is the third hunk in
patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch.
Now the only missing piece is unblocking it.
unblock cross-gcc/230
Helmut
diff --minimal -Nru cross-gcc-226/cross-gcc-dev-helpers.sh cross-gcc-230/cross-gcc-dev-helpers.sh
--- cross-gcc-226/cross-gcc-dev-helpers.sh 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/cross-gcc-dev-helpers.sh 2019-03-27 17:18:10.000000000 +0100
@@ -10,9 +10,9 @@
known_debian_gcc_releases[4.9]="4.9.4-2"
known_debian_gcc_releases[5]="5.5.0-12"
known_debian_gcc_releases[6]="6.5.0-2"
-known_debian_gcc_releases[7]="7.4.0-5"
-known_debian_gcc_releases[8]="8.2.0-21"
-known_debian_gcc_releases[9]="9-20190215-1"
+known_debian_gcc_releases[7]="7.4.0-7"
+known_debian_gcc_releases[8]="8.3.0-4"
+known_debian_gcc_releases[9]="9-20190305-1"
# bash and zsh get associative array keys differently
diff --minimal -Nru cross-gcc-226/debian/changelog cross-gcc-230/debian/changelog
--- cross-gcc-226/debian/changelog 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/debian/changelog 2019-03-27 17:18:10.000000000 +0100
@@ -1,3 +1,27 @@
+cross-gcc (230) unstable; urgency=medium
+
+ * rebuild for 8.3.0-4
+
+ -- Dima Kogan <dima@secretsauce.net> Wed, 27 Mar 2019 09:18:10 -0700
+
+cross-gcc (229) unstable; urgency=medium
+
+ * rebuild for 9-20190305-1
+
+ -- Dima Kogan <dima@secretsauce.net> Sat, 09 Mar 2019 13:42:03 -0800
+
+cross-gcc (228) unstable; urgency=medium
+
+ * rebuild for 7.4.0-7
+
+ -- Dima Kogan <dima@secretsauce.net> Sat, 09 Mar 2019 13:40:21 -0800
+
+cross-gcc (227) unstable; urgency=medium
+
+ * rebuild for 8.3.0-2
+
+ -- Dima Kogan <dima@secretsauce.net> Tue, 05 Mar 2019 23:20:53 -0800
+
cross-gcc (226) unstable; urgency=medium
* rebuild for 9-20190215-1
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-230/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch
--- cross-gcc-226/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From fb5f44c0d0f030254031b99fb007a1a3031cecba Mon Sep 17 00:00:00 2001
+From 8d488d558538e0c77df5bac6dd3127546bcbbcc7 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 01/10] Allowing with_deps_on_target_arch_deps again
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-230/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch
--- cross-gcc-226/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 3070a3e1d6844c2b1d43f0fb0a9f049b4a95b92a Mon Sep 17 00:00:00 2001
+From 9c7e20b962bbe65866bdb098626e9ccb023a4336 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 02/10] added DEB_CROSS_NO_BIARCH option to disable biarch
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-230/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch
--- cross-gcc-226/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 100727ba3254368ded9c550683dd376856e4b65c Mon Sep 17 00:00:00 2001
+From 32423e4d420b9c64afed9c538342c1337b8b7e1a Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 03/10] Compilers now depend on cpp instead of gcc-base
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-230/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch
--- cross-gcc-226/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 70052b73c166b011f75e6824509c0e769e4fa0c6 Mon Sep 17 00:00:00 2001
+From 39d4f354c25bbaaa7b51f25fb8a36b9bbd4c764d Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 15 Dec 2014 14:48:09 -0800
Subject: [PATCH 04/10] added multi-arch-specific install-location patch
@@ -397,10 +397,10 @@
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
diff --git a/debian/rules.patch b/debian/rules.patch
-index 6ff8b44..f69f6dd 100644
+index cf61486..e6f5bc6 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
-@@ -251,9 +251,13 @@ debian_patches += arm-multilib-defaults
+@@ -252,9 +252,13 @@ debian_patches += arm-multilib-defaults
ifeq ($(DEB_CROSS),yes)
debian_patches += cross-fixes
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-230/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch
--- cross-gcc-226/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From e8dac0a6a2b4616f063430142f3f75ded58d717b Mon Sep 17 00:00:00 2001
+From b77f7d7af2bd3a8c32a70780a55f937f720b26f0 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Sun, 3 May 2015 19:28:33 -0700
Subject: [PATCH 05/10] setting all the various paths, options for
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-230/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch
--- cross-gcc-226/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 6bf0b33e2fd6193c4ed79f3c3e951ff6e97edaba Mon Sep 17 00:00:00 2001
+From 28884a4559c3d43af43debd681f0c7fbb9e2e663 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Thu, 18 Dec 2014 14:39:19 -0800
Subject: [PATCH 06/10] Allow target selection via dpkg-buildpackage
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-230/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch
--- cross-gcc-226/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 79da7cb24cad81737e73fed59e134087455a9a88 Mon Sep 17 00:00:00 2001
+From a0063698227706da29aa763795502b74af3e5ddf Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 27 Apr 2015 11:08:31 -0700
Subject: [PATCH 07/10] Skip libjit when we're cross-building
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0008-g-include-directories-functional-again.patch cross-gcc-230/patches/gcc-7/0008-g-include-directories-functional-again.patch
--- cross-gcc-226/patches/gcc-7/0008-g-include-directories-functional-again.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0008-g-include-directories-functional-again.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 15289b7e0594734a483590c4ad73245b3718ba31 Mon Sep 17 00:00:00 2001
+From 4b8c908806ee41b55433c9c98e8693eda2c4f482 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 29 Apr 2015 16:56:53 -0700
Subject: [PATCH 08/10] g++ include directories functional again
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-230/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch
--- cross-gcc-226/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From e42921f655aec2d60e0ea2007d93ffceb31a8225 Mon Sep 17 00:00:00 2001
+From 3e8f3433e844ea05f2326d33dd6f55e7990b450d Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 26 May 2015 01:12:13 -0700
Subject: [PATCH 09/10] gcc-...-base dependencies reverted to gcc-VER-base when
diff --minimal -Nru cross-gcc-226/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-230/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch
--- cross-gcc-226/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 3d30bdad511e9ce1886235f193cfba3ec411139c Mon Sep 17 00:00:00 2001
+From 1c8435218841d17d00612ae3cb523910bd89970f Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 9 Jun 2015 02:13:04 -0700
Subject: [PATCH 10/10] 'base' now part of lib_binaries again, not
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-230/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch
--- cross-gcc-226/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 540c0f15d59314b80b402c02486ff3ca482ff11e Mon Sep 17 00:00:00 2001
+From 8a3f6371ef0dc4dd32a6ce73a6164a60cd1605b5 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 01/10] Allowing with_deps_on_target_arch_deps again
@@ -9,7 +9,7 @@
1 file changed, 3 deletions(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index a511d95..7d1bede 100644
+index b3e5742..6ecc511 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -187,9 +187,6 @@ ifeq ($(DEB_TARGET_ARCH),)
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-230/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch
--- cross-gcc-226/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 7ccf75160d1ebac42c0cb9927a856c1f67f5da50 Mon Sep 17 00:00:00 2001
+From dafb3514b7e9ec7bfd7c64d6e23a746ddbd29b53 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 02/10] added DEB_CROSS_NO_BIARCH option to disable biarch
@@ -9,7 +9,7 @@
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index 7d1bede..2489da6 100644
+index 6ecc511..ef5314e 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1700,7 +1700,9 @@ export biarch_multidir_names
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-230/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch
--- cross-gcc-226/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 67d3792d6bd0c6f12d9a5868f2d0b4ae860a346f Mon Sep 17 00:00:00 2001
+From 5a599745a7d574bcb0d7d5b462717f73f1e8b5f6 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 03/10] Compilers now depend on cpp instead of gcc-base
@@ -11,7 +11,7 @@
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/control.m4 b/debian/control.m4
-index e7ca2b4..7f5746e 100644
+index 21e7834..4bd899e 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -860,7 +860,7 @@ ifdef(`TARGET',`Multi-Arch: foreign
@@ -20,7 +20,7 @@
Priority: optional
-Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libidevdep(stdc++`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${dep:crossbase}, gcc`'PV`'TS (= ${gcc:Version}), libidevdep(stdc++`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends}
- Provides: c++-compiler`'TS`'ifdef(`TARGET)',`',`, c++abi2-dev')
+ Provides: c++-compiler`'TS`'ifdef(`TARGET',`',`, c++abi2-dev')
Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libdbgdep(stdc++CXX_SO`'PV-dbg,)
BUILT_USING`'dnl
@@ -3564,7 +3564,7 @@ Architecture: any
@@ -33,7 +33,7 @@
')dnl
Suggests: ${gfortran:multilib}, gfortran`'PV-doc,
diff --git a/debian/rules.conf b/debian/rules.conf
-index 7efa4fb..9fa0e53 100644
+index 2cb9969..a6dab66 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -1164,6 +1164,8 @@ endif
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-230/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch
--- cross-gcc-226/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From fcaa8bd4ac00303ba148552c36cebd92fdf0787f Mon Sep 17 00:00:00 2001
+From 06dd82c61a37dcf3d24dca5769aa53d716bbc8e6 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 15 Dec 2014 14:48:09 -0800
Subject: [PATCH 04/10] added multi-arch-specific install-location patch
@@ -375,10 +375,10 @@
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
diff --git a/debian/rules.patch b/debian/rules.patch
-index 17c73d5..ca8f9ff 100644
+index 80ed49b..9313d9e 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
-@@ -224,9 +224,13 @@ debian_patches += arm-multilib-defaults
+@@ -227,9 +227,13 @@ debian_patches += arm-multilib-defaults
ifeq ($(DEB_CROSS),yes)
debian_patches += cross-fixes
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-230/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch
--- cross-gcc-226/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 06481c92ffc36a642c194b63fe55716469f2a2e7 Mon Sep 17 00:00:00 2001
+From 2014baa773a27723cc032ea749ea9306a602e516 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Sun, 3 May 2015 19:28:33 -0700
Subject: [PATCH 05/10] setting all the various paths, options for
@@ -13,7 +13,7 @@
5 files changed, 85 insertions(+), 17 deletions(-)
diff --git a/debian/rules.conf b/debian/rules.conf
-index 9fa0e53..4d6b381 100644
+index a6dab66..66d6576 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -651,7 +651,9 @@ ifeq ($(DEB_CROSS),yes)
@@ -80,7 +80,7 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
diff --git a/debian/rules.defs b/debian/rules.defs
-index 2489da6..dc53820 100644
+index ef5314e..999e356 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -206,10 +206,16 @@ else
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-230/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch
--- cross-gcc-226/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 86faf49a59e368df6a7211f5a66a14c8d1469f40 Mon Sep 17 00:00:00 2001
+From 6a07dc06e88894ad46a441fb31354afa68bd1845 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Thu, 18 Dec 2014 14:39:19 -0800
Subject: [PATCH 06/10] Allow target selection via dpkg-buildpackage
@@ -9,7 +9,7 @@
1 file changed, 16 insertions(+), 36 deletions(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index dc53820..f89bb4e 100644
+index 999e356..46ae339 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -40,23 +40,7 @@ vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-230/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch
--- cross-gcc-226/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 53c7338c79d6e83be02d95f9f4c7c6920bbeab8a Mon Sep 17 00:00:00 2001
+From c0017d4a6f4bf65220d3652f8ff7d413b7d6a2ba Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 27 Apr 2015 11:08:31 -0700
Subject: [PATCH 07/10] Skip libjit when we're cross-building
@@ -8,7 +8,7 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index f89bb4e..0270d45 100644
+index 46ae339..992242a 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -630,7 +630,9 @@ endif
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0008-g-include-directories-functional-again.patch cross-gcc-230/patches/gcc-8/0008-g-include-directories-functional-again.patch
--- cross-gcc-226/patches/gcc-8/0008-g-include-directories-functional-again.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0008-g-include-directories-functional-again.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 6b233c1a85cd38a1dc52dcf63b20b54847f6cd34 Mon Sep 17 00:00:00 2001
+From a7df547b45c4f8fdfa5dde028f80e592a1b931ec Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 29 Apr 2015 16:56:53 -0700
Subject: [PATCH 08/10] g++ include directories functional again
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-230/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch
--- cross-gcc-226/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 077bb720e469e5b825b9018574b56b81c15149f6 Mon Sep 17 00:00:00 2001
+From b2333ddf4c3cb0ee04ff1b5bc2e04b5aecbe5ce2 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 26 May 2015 01:12:13 -0700
Subject: [PATCH 09/10] gcc-...-base dependencies reverted to gcc-VER-base when
@@ -12,7 +12,7 @@
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/control.m4 b/debian/control.m4
-index 7f5746e..3d85557 100644
+index 4bd899e..a93b8d7 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -124,12 +124,13 @@ Description: SNAPSHOT of the GNU Compiler Collection
diff --minimal -Nru cross-gcc-226/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-230/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch
--- cross-gcc-226/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 9fa2046fba6fde4ddf8026fb08f1c621ace37014 Mon Sep 17 00:00:00 2001
+From bc056334ee40603963a6a5f2c616d844ddce5e73 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 9 Jun 2015 02:13:04 -0700
Subject: [PATCH 10/10] 'base' now part of lib_binaries again, not
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-230/patches/gcc-9/0001-Allowing-with_deps_on_target_arch_deps-again.patch
--- cross-gcc-226/patches/gcc-9/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 005739f3795eda3e3c02dd39fbbdd47b717be2a4 Mon Sep 17 00:00:00 2001
+From 836ac17e025b75385d8b4827767264bddf7c1376 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 01/10] Allowing with_deps_on_target_arch_deps again
@@ -9,10 +9,10 @@
1 file changed, 3 deletions(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index ac03504..1487a7c 100644
+index 15ca6b4..2a39df4 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
-@@ -192,9 +192,6 @@ ifeq ($(DEB_TARGET_ARCH),)
+@@ -188,9 +188,6 @@ ifeq ($(DEB_TARGET_ARCH),)
$(error Invalid architecure.)
endif
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-230/patches/gcc-9/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch
--- cross-gcc-226/patches/gcc-9/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 2d6e505cc7e30b8a2162386fb5940bb6cf63dcde Mon Sep 17 00:00:00 2001
+From b45d1d47d86c7781877fc04ac71740fabae567cc Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 02/10] added DEB_CROSS_NO_BIARCH option to disable biarch
@@ -9,10 +9,10 @@
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index 1487a7c..6e44d03 100644
+index 2a39df4..4b6d1bc 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
-@@ -1678,7 +1678,9 @@ export biarch_multidir_names
+@@ -1669,7 +1669,9 @@ export biarch_multidir_names
#ifeq ($(trunk_build),yes)
# no_biarch_libs := yes
#endif
@@ -23,7 +23,7 @@
ifeq ($(no_biarch_libs),yes)
with_lib64gcc := no
-@@ -1828,6 +1830,15 @@ ifeq ($(no_biarch_libs),yes)
+@@ -1819,6 +1821,15 @@ ifeq ($(no_biarch_libs),yes)
with_libsfphobosdev := no
with_libsfhsailrtdev := no
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-230/patches/gcc-9/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch
--- cross-gcc-226/patches/gcc-9/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 5bb36586a8de20f6f86e68eb42b81b6042e2c2d4 Mon Sep 17 00:00:00 2001
+From bca82d02f1b3ba2b373a8a0defb5a4c2266afd6e Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 03/10] Compilers now depend on cpp instead of gcc-base
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-230/patches/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch
--- cross-gcc-226/patches/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 245bb0c74ed086bc1eb967552f8d61c255e1ce34 Mon Sep 17 00:00:00 2001
+From 3164bee8b001431dc382f13a5e2385a1080c1d60 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 9 Jan 2019 12:17:07 -0800
Subject: [PATCH 04/10] added multi-arch-specific install-location patch
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-230/patches/gcc-9/0005-setting-all-the-various-paths-options-for-with_deps_.patch
--- cross-gcc-226/patches/gcc-9/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 4257fb9a8ef3e2dad624292744058f9d62796995 Mon Sep 17 00:00:00 2001
+From 8f0983b32e6aec5ca80bad3b6da4ae2bc9766271 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Sun, 3 May 2015 19:28:33 -0700
Subject: [PATCH 05/10] setting all the various paths, options for
@@ -80,10 +80,10 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTONS)))
diff --git a/debian/rules.defs b/debian/rules.defs
-index 6e44d03..0953297 100644
+index 4b6d1bc..7348a3e 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
-@@ -211,10 +211,16 @@ else
+@@ -207,10 +207,16 @@ else
# cross compiler, sets WITH_SYSROOT on it's own
DEB_CROSS = yes
build_type = build-cross
@@ -100,7 +100,7 @@
else
# native build
build_type = build-native
-@@ -243,6 +249,13 @@ ifeq ($(DEB_CROSS),yes)
+@@ -239,6 +245,13 @@ ifeq ($(DEB_CROSS),yes)
cross_lib_arch := -$(subst _,-,$(DEB_TARGET_ARCH))-cross
cmd_prefix := $(DEB_TARGET_GNU_TYPE)-
@@ -114,7 +114,7 @@
TARGET_ALIAS := $(DEB_TARGET_ALIAS)
lib_binaries := indep_binaries
-@@ -464,7 +477,11 @@ endif
+@@ -460,7 +473,11 @@ endif
ifeq ($(with_multiarch_lib),yes)
ifneq ($(single_package),yes)
@@ -127,7 +127,7 @@
with_multiarch_cxxheaders := yes
endif
endif
-@@ -1998,12 +2015,13 @@ stamp-dir:
+@@ -1989,12 +2006,13 @@ stamp-dir:
mkdir -p $(stampdir)
ifeq ($(DEB_CROSS),yes)
@@ -144,7 +144,7 @@
if [ -f debian/$(1).substvars ]; then \
sed -i \
-e 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' \
-@@ -2012,7 +2030,13 @@ ifeq ($(DEB_CROSS),yes)
+@@ -2003,7 +2021,13 @@ ifeq ($(DEB_CROSS),yes)
$(if $(filter armhf,$(DEB_TARGET_ARCH)),-e 's/:armel/-armel-cross/g') \
debian/$(1).substvars; \
fi
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-230/patches/gcc-9/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch
--- cross-gcc-226/patches/gcc-9/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 1edae6a87dcf3a101aaaf621fc1d7123ccf01d9d Mon Sep 17 00:00:00 2001
+From 4bb3bb33cea96027c51346f7ea1c5e10d22f77d5 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Thu, 18 Dec 2014 14:39:19 -0800
Subject: [PATCH 06/10] Allow target selection via dpkg-buildpackage
@@ -9,7 +9,7 @@
1 file changed, 16 insertions(+), 36 deletions(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index 0953297..94bb9a9 100644
+index 7348a3e..557e663 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -33,23 +33,7 @@ vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
@@ -36,7 +36,7 @@
DEB_BUILD_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_ARCH)
DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
DEB_BUILD_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_MULTIARCH)
-@@ -128,7 +112,7 @@ export LIBC_FATAL_STDERR_=1
+@@ -124,7 +108,7 @@ export LIBC_FATAL_STDERR_=1
# ---------------------------------------------------------------------------
# set target
@@ -45,7 +45,7 @@
# - Debian arch in debian/target
# - Debian arch via DEB_GCC_TARGET or GCC_TARGET
#
-@@ -136,32 +120,28 @@ export LIBC_FATAL_STDERR_=1
+@@ -132,32 +116,28 @@ export LIBC_FATAL_STDERR_=1
ifdef GCC_TARGET
DEB_GCC_TARGET := $(GCC_TARGET)
endif
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-230/patches/gcc-9/0007-Skip-libjit-when-we-re-cross-building.patch
--- cross-gcc-226/patches/gcc-9/0007-Skip-libjit-when-we-re-cross-building.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0007-Skip-libjit-when-we-re-cross-building.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 6cd19d57f342e617ce66a4fa23d2968a4294b2e9 Mon Sep 17 00:00:00 2001
+From 4a778bac1cbf4ade75986daf61c67888675738a7 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 27 Apr 2015 11:08:31 -0700
Subject: [PATCH 07/10] Skip libjit when we're cross-building
@@ -8,10 +8,10 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/rules.defs b/debian/rules.defs
-index 94bb9a9..4ec29f0 100644
+index 557e663..3340a82 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
-@@ -636,7 +636,9 @@ endif
+@@ -632,7 +632,9 @@ endif
# C ---------------------------
enabled_languages := c
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0008-g-include-directories-functional-again.patch cross-gcc-230/patches/gcc-9/0008-g-include-directories-functional-again.patch
--- cross-gcc-226/patches/gcc-9/0008-g-include-directories-functional-again.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0008-g-include-directories-functional-again.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From d827b1198b8ecd7343a0acc1be9e687e8e681b54 Mon Sep 17 00:00:00 2001
+From e93dfad25d1ee6a9ec2cd2abe5f69a6a4922fe9d Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 29 Apr 2015 16:56:53 -0700
Subject: [PATCH 08/10] g++ include directories functional again
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-230/patches/gcc-9/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch
--- cross-gcc-226/patches/gcc-9/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 0d1faed73b4b575f03bdf4ed80ca2e14ad5741bc Mon Sep 17 00:00:00 2001
+From fba04ab4cec1ff9b578e06a95d0bbea5a298d6d0 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 26 May 2015 01:12:13 -0700
Subject: [PATCH 09/10] gcc-...-base dependencies reverted to gcc-VER-base when
diff --minimal -Nru cross-gcc-226/patches/gcc-9/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-230/patches/gcc-9/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch
--- cross-gcc-226/patches/gcc-9/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2019-02-17 02:54:26.000000000 +0100
+++ cross-gcc-230/patches/gcc-9/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2019-03-27 17:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-From 406fe241df63a0381907750914df7fa4d55c9885 Mon Sep 17 00:00:00 2001
+From 62306b298fbf5b19fb29590f7a81760591c74b4f Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 9 Jun 2015 02:13:04 -0700
Subject: [PATCH 10/10] 'base' now part of lib_binaries again, not
--- End Message ---