diff -Nru cross-gcc-189/cross-gcc-dev-helpers.sh cross-gcc-191/cross-gcc-dev-helpers.sh --- cross-gcc-189/cross-gcc-dev-helpers.sh 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/cross-gcc-dev-helpers.sh 2018-05-13 18:55:26.000000000 +0000 @@ -10,8 +10,8 @@ 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.4.0-17" -known_debian_gcc_releases[7]="7.3.0-17" -known_debian_gcc_releases[8]="8.1.0-1" +known_debian_gcc_releases[7]="7.3.0-18" +known_debian_gcc_releases[8]="8.1.0-3" # bash and zsh get associative array keys differently diff -Nru cross-gcc-189/debian/changelog cross-gcc-191/debian/changelog --- cross-gcc-189/debian/changelog 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/debian/changelog 2018-05-13 18:55:26.000000000 +0000 @@ -1,3 +1,15 @@ +cross-gcc (191) unstable; urgency=medium + + * rebuild for 8.1.0-3 + + -- Dima Kogan Sun, 13 May 2018 11:55:26 -0700 + +cross-gcc (190) unstable; urgency=medium + + * rebuild for 7.3.0-18 + + -- Dima Kogan Sun, 13 May 2018 11:53:03 -0700 + cross-gcc (189) unstable; urgency=medium * rebuild for 8.1.0-1 diff -Nru cross-gcc-189/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-191/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-189/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 6410a73ac0743aa3076081ca6b655e24a34b01d0 Mon Sep 17 00:00:00 2001 +From b2f2918a3367680cb80c4fc84fb7955dd89d90b9 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 01/10] Allowing with_deps_on_target_arch_deps again diff -Nru cross-gcc-189/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-191/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-189/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 047a43d22c813112a66c616191332e2f56e5f27a Mon Sep 17 00:00:00 2001 +From 47c6cdd792c7ccbd1b532e232d4f7ecf9e3236f6 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 02/10] added DEB_CROSS_NO_BIARCH option to disable biarch diff -Nru cross-gcc-189/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-191/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-189/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From b8b9bc62043b89253391b742cf16a4ba44d89121 Mon Sep 17 00:00:00 2001 +From df8cbd5bcc6bd87f220cb4a75aebee0aedf25b78 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 03/10] Compilers now depend on cpp instead of gcc-base @@ -33,10 +33,10 @@ Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libdbgdep(gfortran`'FORTRAN_SO-dbg,), diff --git a/debian/rules.conf b/debian/rules.conf -index 49d2efa..3a2aa0f 100644 +index b4bf26f..19ac6e8 100644 --- a/debian/rules.conf +++ b/debian/rules.conf -@@ -1171,6 +1171,8 @@ endif +@@ -1173,6 +1173,8 @@ endif ifeq ($(DEB_CROSS),yes) echo 'dep:gdccross=gdc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ >> debian/substvars.local.tmp diff -Nru cross-gcc-189/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-191/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-189/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 63170f5a753db7e255bc5b2c74d3fac6c7b7bda9 Mon Sep 17 00:00:00 2001 +From ae2258ee8214a38d0fd5938c412b627edfc2fcd7 Mon Sep 17 00:00:00 2001 From: Dima Kogan 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 bd85dba..434b2f3 100644 +index 77eca11..cb12f66 100644 --- a/debian/rules.patch +++ b/debian/rules.patch -@@ -245,9 +245,13 @@ debian_patches += arm-multilib-defaults +@@ -244,9 +244,13 @@ debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-fixes diff -Nru cross-gcc-189/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-191/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-189/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From f914f1ac6db242b3540dd0842a62fccccd9e4da9 Mon Sep 17 00:00:00 2001 +From 453820c208d8f1c287dcacc4c7f94d45fb720bae Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sun, 3 May 2015 19:28:33 -0700 Subject: [PATCH 05/10] setting all the various paths, options for @@ -13,10 +13,10 @@ 5 files changed, 85 insertions(+), 17 deletions(-) diff --git a/debian/rules.conf b/debian/rules.conf -index 3a2aa0f..daa2862 100644 +index 19ac6e8..2553a57 100644 --- a/debian/rules.conf +++ b/debian/rules.conf -@@ -649,7 +649,9 @@ ifeq ($(DEB_CROSS),yes) +@@ -651,7 +651,9 @@ ifeq ($(DEB_CROSS),yes) -DTARGET=$(DEB_TARGET_ARCH) \ -DLIBUNWIND_BUILD_DEP="$(LIBUNWIND_BUILD_DEP)" \ -DLIBATOMIC_OPS_BUILD_DEP="$(LIBATOMIC_OPS_BUILD_DEP)" @@ -27,7 +27,7 @@ ctrl_flags += -DCROSS_ARCH=$(DEB_TARGET_ARCH) endif else -@@ -1270,7 +1272,8 @@ parameters-file: +@@ -1272,7 +1274,8 @@ parameters-file: symbols-files: control-file ifeq ($(DEB_CROSS),yes) @@ -160,10 +160,10 @@ define cross_mangle_shlibs endef diff --git a/debian/rules2 b/debian/rules2 -index 1608e59..b26ddf0 100644 +index a257d17..a414235 100644 --- a/debian/rules2 +++ b/debian/rules2 -@@ -769,8 +769,11 @@ CONFARGS += \ +@@ -772,8 +772,11 @@ CONFARGS += \ ifeq ($(DEB_CROSS),yes) CONFARGS += \ @@ -176,7 +176,7 @@ endif ifeq ($(with_bootstrap),off) -@@ -915,21 +918,33 @@ endif +@@ -918,21 +921,33 @@ endif # PFL is the installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds ifeq ($(DEB_CROSS),yes) @@ -213,7 +213,7 @@ else libdir = lib/$(DEB_TARGET_MULTIARCH) endif -@@ -955,7 +970,9 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS) +@@ -958,7 +973,9 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS) gcc_subdir_name = gcc ifneq ($(single_package),yes) ifeq ($(DEB_CROSS),yes) @@ -224,7 +224,7 @@ endif endif -@@ -977,7 +994,11 @@ d_l= debian/$(p_l) +@@ -980,7 +997,11 @@ d_l= debian/$(p_l) d_d= debian/$(p_d) ifeq ($(DEB_CROSS),yes) @@ -237,7 +237,7 @@ else usr_lib = $(PFL)/$(libdir) endif -@@ -1837,9 +1858,16 @@ ifeq ($(if $(filter yes,$(DEB_CROSS)),$(if $(filter rtlibs,$(DEB_STAGE)),native, +@@ -1840,9 +1861,16 @@ ifeq ($(if $(filter yes,$(DEB_CROSS)),$(if $(filter rtlibs,$(DEB_STAGE)),native, p_doc = gcc$(pkg_ver)-doc else # only triggered if DEB_CROSS set @@ -257,7 +257,7 @@ p_cpp = cpp$(pkg_ver)$(cross_bin_arch) p_gcc = gcc$(pkg_ver)$(cross_bin_arch) p_cxx = g++$(pkg_ver)$(cross_bin_arch) -@@ -2553,6 +2581,8 @@ binary-indep: debian/indep_binaries.all +@@ -2556,6 +2584,8 @@ binary-indep: debian/indep_binaries.all fi ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32el)) @@ -266,7 +266,7 @@ for p in `cat debian/indep_binaries debian/indep_binaries.epoch`; do \ p=$${p#-p*}; \ case "$$p" in \ -@@ -2560,6 +2590,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 +@@ -2563,6 +2593,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 libn32*) echo mangle $$p; sed -i -r '/^(Dep|Rec|Sug)/s/lib64[^,]+(, *|$$)//g;/^(Dep|Rec|Sug)/s/$(p_lgcc)/$(p_ln32gcc)/;/^(Dep|Rec|Sug)/s/ *, *$$//' debian/$$p/DEBIAN/control;; \ esac; \ done diff -Nru cross-gcc-189/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-191/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-189/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 3ae60d0decdcea7a87b3b77f58e543bf990a6f04 Mon Sep 17 00:00:00 2001 +From c11ad412b22a8fdb9ee1c050566b1b25661fd33b Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 18 Dec 2014 14:39:19 -0800 Subject: [PATCH 06/10] Allow target selection via dpkg-buildpackage diff -Nru cross-gcc-189/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-191/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-189/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From eb61b73a48273320d8602a3f7b939ffdbedf065a Mon Sep 17 00:00:00 2001 +From f358e3c32462bddc59bc94d85fd87d4dcc3ae5c4 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Mon, 27 Apr 2015 11:08:31 -0700 Subject: [PATCH 07/10] Skip libjit when we're cross-building diff -Nru cross-gcc-189/patches/gcc-7/0008-g-include-directories-functional-again.patch cross-gcc-191/patches/gcc-7/0008-g-include-directories-functional-again.patch --- cross-gcc-189/patches/gcc-7/0008-g-include-directories-functional-again.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0008-g-include-directories-functional-again.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 79ac7b80ec41f0b42a86bf4aff7ce03561fc435c Mon Sep 17 00:00:00 2001 +From a9679ee1712e41c8467af843d842a2e35b354d74 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Wed, 29 Apr 2015 16:56:53 -0700 Subject: [PATCH 08/10] g++ include directories functional again diff -Nru cross-gcc-189/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-191/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-189/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From b95bbfc56c8ca29a69b23e0bd1e69c3cc4ea45d5 Mon Sep 17 00:00:00 2001 +From c05fcfc393831b2dedc1ead76c8b8f3517650849 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 26 May 2015 01:12:13 -0700 Subject: [PATCH 09/10] gcc-...-base dependencies reverted to gcc-VER-base when diff -Nru cross-gcc-189/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-191/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-189/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 1f70ba448e4b3d02fdaf7403d08d978f760688f4 Mon Sep 17 00:00:00 2001 +From 332ef7d72197dfb3fd2b8867c65fa6646c80c446 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 9 Jun 2015 02:13:04 -0700 Subject: [PATCH 10/10] 'base' now part of lib_binaries again, not diff -Nru cross-gcc-189/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-191/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-189/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From f1c083606d712927dd4935afa09b86d511cfd95d Mon Sep 17 00:00:00 2001 +From 7ef9873c33b0cccfbdfe4638d26bdf7e0944ad99 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 01/10] Allowing with_deps_on_target_arch_deps again diff -Nru cross-gcc-189/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-191/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-189/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From aa49b729790306495d87531174675da2dcfb8e1d Mon Sep 17 00:00:00 2001 +From 7aaabb7e93d33289429604311786ca5c4ab3f43a Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 02/10] added DEB_CROSS_NO_BIARCH option to disable biarch diff -Nru cross-gcc-189/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-191/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-189/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From da4d1313677971071d086dff02cae81e0bd47f4c Mon Sep 17 00:00:00 2001 +From 8aed9b4c7d9ade360df70902753b26299052c15a Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 03/10] Compilers now depend on cpp instead of gcc-base diff -Nru cross-gcc-189/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-191/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-189/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 34423f621edefedd0c7eae3a5e090fa9629f260c Mon Sep 17 00:00:00 2001 +From a89caeff5e831f49e4d1d3c590bf6320c998dd70 Mon Sep 17 00:00:00 2001 From: Dima Kogan 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 842c791..db67f72 100644 +index 9243707..371fc24 100644 --- a/debian/rules.patch +++ b/debian/rules.patch -@@ -228,9 +228,13 @@ debian_patches += arm-multilib-defaults +@@ -233,9 +233,13 @@ debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-fixes diff -Nru cross-gcc-189/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-191/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-189/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From eb6b38904fbec7a15f2066d4969ec2642da86e41 Mon Sep 17 00:00:00 2001 +From 31d555a66d248eade9f433ef78cfefd3616c6f64 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sun, 3 May 2015 19:28:33 -0700 Subject: [PATCH 05/10] setting all the various paths, options for @@ -160,10 +160,10 @@ define cross_mangle_shlibs endef diff --git a/debian/rules2 b/debian/rules2 -index b019ec9..e6265b5 100644 +index c4880b7..6b208ba 100644 --- a/debian/rules2 +++ b/debian/rules2 -@@ -780,8 +780,11 @@ CONFARGS += \ +@@ -783,8 +783,11 @@ CONFARGS += \ ifeq ($(DEB_CROSS),yes) CONFARGS += \ @@ -176,7 +176,7 @@ endif ifeq ($(with_bootstrap),off) -@@ -926,21 +929,33 @@ endif +@@ -929,21 +932,33 @@ endif # PFL is the installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds ifeq ($(DEB_CROSS),yes) @@ -213,7 +213,7 @@ else libdir = lib/$(DEB_TARGET_MULTIARCH) endif -@@ -966,7 +981,9 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS) +@@ -969,7 +984,9 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS) gcc_subdir_name = gcc ifneq ($(single_package),yes) ifeq ($(DEB_CROSS),yes) @@ -224,7 +224,7 @@ endif endif -@@ -988,7 +1005,11 @@ d_l= debian/$(p_l) +@@ -991,7 +1008,11 @@ d_l= debian/$(p_l) d_d= debian/$(p_d) ifeq ($(DEB_CROSS),yes) @@ -237,7 +237,7 @@ else usr_lib = $(PFL)/$(libdir) endif -@@ -1848,9 +1869,16 @@ ifeq ($(if $(filter yes,$(DEB_CROSS)),$(if $(filter rtlibs,$(DEB_STAGE)),native, +@@ -1851,9 +1872,16 @@ ifeq ($(if $(filter yes,$(DEB_CROSS)),$(if $(filter rtlibs,$(DEB_STAGE)),native, p_doc = gcc$(pkg_ver)-doc else # only triggered if DEB_CROSS set @@ -257,7 +257,7 @@ p_cpp = cpp$(pkg_ver)$(cross_bin_arch) p_gcc = gcc$(pkg_ver)$(cross_bin_arch) p_cxx = g++$(pkg_ver)$(cross_bin_arch) -@@ -2556,6 +2584,8 @@ binary-indep: debian/indep_binaries.all +@@ -2559,6 +2587,8 @@ binary-indep: debian/indep_binaries.all fi ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32el)) @@ -266,7 +266,7 @@ for p in `cat debian/indep_binaries debian/indep_binaries.epoch`; do \ p=$${p#-p*}; \ case "$$p" in \ -@@ -2563,6 +2593,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 +@@ -2566,6 +2596,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 libn32*) echo mangle $$p; sed -i -r '/^(Dep|Rec|Sug)/s/lib64[^,]+(, *|$$)//g;/^(Dep|Rec|Sug)/s/$(p_lgcc)/$(p_ln32gcc)/;/^(Dep|Rec|Sug)/s/ *, *$$//' debian/$$p/DEBIAN/control;; \ esac; \ done diff -Nru cross-gcc-189/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-191/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-189/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 31a2ae5a9839665accb4394a491d7d6935d2fd44 Mon Sep 17 00:00:00 2001 +From 1b2a903766650a759d8432732f3abb439be3629a Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 18 Dec 2014 14:39:19 -0800 Subject: [PATCH 06/10] Allow target selection via dpkg-buildpackage diff -Nru cross-gcc-189/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-191/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-189/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 251553b1a6894a16a857c864ded50256d288f420 Mon Sep 17 00:00:00 2001 +From 50dfa6fcbbf519e785f0d42734135f94b616e1ed Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Mon, 27 Apr 2015 11:08:31 -0700 Subject: [PATCH 07/10] Skip libjit when we're cross-building diff -Nru cross-gcc-189/patches/gcc-8/0008-g-include-directories-functional-again.patch cross-gcc-191/patches/gcc-8/0008-g-include-directories-functional-again.patch --- cross-gcc-189/patches/gcc-8/0008-g-include-directories-functional-again.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0008-g-include-directories-functional-again.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From af578e349956a3cfc0b45926ce6648be3c4d16a2 Mon Sep 17 00:00:00 2001 +From 24d727db5379cbd8f07cc3df07e21174d6693321 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Wed, 29 Apr 2015 16:56:53 -0700 Subject: [PATCH 08/10] g++ include directories functional again @@ -16,7 +16,7 @@ 1 file changed, 29 insertions(+) diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff -index 7f7c8b6..feb2c37 100644 +index a48a648..b1dd7e2 100644 --- a/debian/patches/g++-multiarch-incdir.diff +++ b/debian/patches/g++-multiarch-incdir.diff @@ -117,3 +117,32 @@ Index: b/src/gcc/incpath.c diff -Nru cross-gcc-189/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-191/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-189/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From e0f9fd7cd36464983ebb111041f57d7887186f5b Mon Sep 17 00:00:00 2001 +From 4583e5912b707e1563cf2a91f086dc7915dd9d57 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 26 May 2015 01:12:13 -0700 Subject: [PATCH 09/10] gcc-...-base dependencies reverted to gcc-VER-base when diff -Nru cross-gcc-189/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-191/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-189/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-05-05 22:52:39.000000000 +0000 +++ cross-gcc-191/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-05-13 18:55:26.000000000 +0000 @@ -1,4 +1,4 @@ -From 83e8183ad6059870f9bf1421adb965973d067740 Mon Sep 17 00:00:00 2001 +From 3701312c062269d9dce5079937cc73eef0aa75e5 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 9 Jun 2015 02:13:04 -0700 Subject: [PATCH 10/10] 'base' now part of lib_binaries again, not