diff -Nru cross-gcc-173/cross-gcc-dev-helpers.sh cross-gcc-175/cross-gcc-dev-helpers.sh --- cross-gcc-173/cross-gcc-dev-helpers.sh 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/cross-gcc-dev-helpers.sh 2018-02-18 22:49:49.000000000 +0000 @@ -10,8 +10,8 @@ known_debian_gcc_releases[4.9]="4.9.4-2" known_debian_gcc_releases[5]="5.5.0-7" known_debian_gcc_releases[6]="6.4.0-12" -known_debian_gcc_releases[7]="7.3.0-1" -known_debian_gcc_releases[8]="8-20180123-1" +known_debian_gcc_releases[7]="7.3.0-4" +known_debian_gcc_releases[8]="8-20180218-1" # bash and zsh get associative array keys differently diff -Nru cross-gcc-173/debian/changelog cross-gcc-175/debian/changelog --- cross-gcc-173/debian/changelog 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/debian/changelog 2018-02-18 22:49:49.000000000 +0000 @@ -1,3 +1,15 @@ +cross-gcc (175) unstable; urgency=medium + + * rebuild for 7.3.0-4 + + -- Dima Kogan Sun, 18 Feb 2018 14:49:49 -0800 + +cross-gcc (174) unstable; urgency=medium + + * rebuild for 8-20180218-1 + + -- Dima Kogan Sun, 18 Feb 2018 14:43:29 -0800 + cross-gcc (173) unstable; urgency=medium * rebuild for 8-20180123-1 diff -Nru cross-gcc-173/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-175/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-173/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 13d171a56fa21cadf791c0486d3f3403d999f251 Mon Sep 17 00:00:00 2001 +From d1135e9588b3bf63340838cf8254883e93b57efa 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 @@ -9,7 +9,7 @@ 1 file changed, 3 deletions(-) diff --git a/debian/rules.defs b/debian/rules.defs -index 91e97a5..84dca0a 100644 +index bcb2816..21f6779 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -187,9 +187,6 @@ ifeq ($(DEB_TARGET_ARCH),) diff -Nru cross-gcc-173/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-175/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-173/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From b9fc7c556fd196e93bfc8d507d36a30583840b2d Mon Sep 17 00:00:00 2001 +From c6090c89081df2021d225493615c28b4c1b23955 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 @@ -9,10 +9,10 @@ 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/rules.defs b/debian/rules.defs -index 84dca0a..30e50eb 100644 +index 21f6779..93bb827 100644 --- a/debian/rules.defs +++ b/debian/rules.defs -@@ -1691,7 +1691,9 @@ export biarch_multidir_names +@@ -1695,7 +1695,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 -@@ -1846,6 +1848,15 @@ ifeq ($(no_biarch_libs),yes) +@@ -1850,6 +1852,15 @@ ifeq ($(no_biarch_libs),yes) with_libsfphobosdev := no with_libsfhsailrtdev := no diff -Nru cross-gcc-173/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-175/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-173/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 138ea4b30d8f637b76cf01eb44b6744053426106 Mon Sep 17 00:00:00 2001 +From f9aa5948a9b79ef9d5f814fe6da0c190c5de8b78 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,7 +33,7 @@ Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libdbgdep(gfortran`'FORTRAN_SO-dbg,), diff --git a/debian/rules.conf b/debian/rules.conf -index 86bccab..2abc152 100644 +index 862ab5d..1ebdb5f 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1191,6 +1191,8 @@ endif diff -Nru cross-gcc-173/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-175/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-173/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 13bcb24772e8892197fbf52f4456634ee6d6446d Mon Sep 17 00:00:00 2001 +From 98b543570bfb2b760c90c04955751bc07a49c417 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 22cfd54..9b45e39 100644 +index 3b8619c..a50662a 100644 --- a/debian/rules.patch +++ b/debian/rules.patch -@@ -227,9 +227,13 @@ debian_patches += arm-multilib-defaults +@@ -230,9 +230,13 @@ debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-fixes diff -Nru cross-gcc-173/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-175/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-173/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 4aa10d347abdb0bad390bb8011ea3c16281eb7ff Mon Sep 17 00:00:00 2001 +From 2626bbbb9940a10867bedba82c2f3de4a25fcff5 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,7 +13,7 @@ 5 files changed, 82 insertions(+), 17 deletions(-) diff --git a/debian/rules.conf b/debian/rules.conf -index 2abc152..67f8e7a 100644 +index 1ebdb5f..9cc9d92 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -669,7 +669,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 30e50eb..d786c0e 100644 +index 93bb827..6d42c28 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -209,6 +209,9 @@ else @@ -120,7 +120,7 @@ with_multiarch_cxxheaders := yes endif endif -@@ -2022,12 +2036,13 @@ stamp-dir: +@@ -2026,12 +2040,13 @@ stamp-dir: mkdir -p $(stampdir) ifeq ($(DEB_CROSS),yes) @@ -137,7 +137,7 @@ if [ -f debian/$(1).substvars ]; then \ sed -i \ -e 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' \ -@@ -2036,7 +2051,13 @@ ifeq ($(DEB_CROSS),yes) +@@ -2040,7 +2055,13 @@ ifeq ($(DEB_CROSS),yes) $(if $(filter armhf,$(DEB_TARGET_ARCH)),-e 's/:armel/-armel-cross/g') \ debian/$(1).substvars; \ fi @@ -153,7 +153,7 @@ define cross_mangle_shlibs endef diff --git a/debian/rules2 b/debian/rules2 -index 4981078..8491790 100644 +index 44bfab5..3ffa1c5 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -747,8 +747,11 @@ CONFARGS += \ diff -Nru cross-gcc-173/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-175/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-173/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From dde1c2018dc9b8bcb9de0d0a2db1d5b99b497523 Mon Sep 17 00:00:00 2001 +From 5c6fc496ad1981b4fc6a8e452de4e2e0960c1d81 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 @@ -9,7 +9,7 @@ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/debian/rules.defs b/debian/rules.defs -index d786c0e..db4972a 100644 +index 6d42c28..16f33a0 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -40,23 +40,7 @@ vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) diff -Nru cross-gcc-173/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-175/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-173/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 74c7b69c290703c4554998268d054fa89c012d0f Mon Sep 17 00:00:00 2001 +From 26b394918ac7dd6780d0413df1659a9d4b1ad712 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 @@ -8,7 +8,7 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules.defs b/debian/rules.defs -index db4972a..295172f 100644 +index 16f33a0..c1bd941 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -620,7 +620,9 @@ endif diff -Nru cross-gcc-173/patches/gcc-7/0008-g-include-directories-functional-again.patch cross-gcc-175/patches/gcc-7/0008-g-include-directories-functional-again.patch --- cross-gcc-173/patches/gcc-7/0008-g-include-directories-functional-again.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0008-g-include-directories-functional-again.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From f2baa784c985aecdacfa34658804227b1cce813a Mon Sep 17 00:00:00 2001 +From 35f4a8dfb4cd40602e57c9ab439df6384040406d 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 70a2771..5ee7843 100644 +index 906d7e9..65dd71d 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-173/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-175/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-173/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 596b295b01861b4ab832cb2af823e389477693c5 Mon Sep 17 00:00:00 2001 +From 538feb099d893ab245321a9ee12d63eb80dec9d7 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-173/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-175/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-173/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 58adff562246e9e1c934c59b6be3c57c46236a71 Mon Sep 17 00:00:00 2001 +From 84d231b492ecfbd02857875a4c2375c65d5b402e 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-173/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-175/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-173/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From c49954d1a0756a7308aa7df9af7b99dc354ae428 Mon Sep 17 00:00:00 2001 +From 5047ea92a371cdee9f4b72d791941aa5bdf0287d 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 @@ -9,7 +9,7 @@ 1 file changed, 3 deletions(-) diff --git a/debian/rules.defs b/debian/rules.defs -index b872fa0..79eb470 100644 +index 91236a0..b94e8cf 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -187,9 +187,6 @@ ifeq ($(DEB_TARGET_ARCH),) diff -Nru cross-gcc-173/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-175/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-173/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 0adcfc67c146cd6be692a5a42b19e26f47a16f89 Mon Sep 17 00:00:00 2001 +From 1a14eeba0440ad0fd20ef659ad27abb10407afee 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 @@ -9,10 +9,10 @@ 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/rules.defs b/debian/rules.defs -index 79eb470..34939c0 100644 +index b94e8cf..aa93ae5 100644 --- a/debian/rules.defs +++ b/debian/rules.defs -@@ -1681,7 +1681,9 @@ export biarch_multidir_names +@@ -1685,7 +1685,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 -@@ -1833,6 +1835,15 @@ ifeq ($(no_biarch_libs),yes) +@@ -1837,6 +1839,15 @@ ifeq ($(no_biarch_libs),yes) with_libsfphobosdev := no with_libsfhsailrtdev := no diff -Nru cross-gcc-173/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-175/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-173/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From cb02214aa7e3ff330e9aa86e7f223b638c9ee2b9 Mon Sep 17 00:00:00 2001 +From 27eff66f1105db68bf9d9ef3223795b896680b10 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,7 +33,7 @@ Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libdbgdep(gfortran`'FORTRAN_SO-dbg,), diff --git a/debian/rules.conf b/debian/rules.conf -index ab075de..8f38a77 100644 +index 00fe8a1..3736401 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1173,6 +1173,8 @@ endif diff -Nru cross-gcc-173/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-175/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-173/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0004-added-multi-arch-specific-install-location-patch.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 3504e94d585bff505fd3729062753704b84a4cc9 Mon Sep 17 00:00:00 2001 +From af60f537bb8396605243958709edd70ada112cb1 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 424cf60..631e28d 100644 +index c97aa14..67c08d8 100644 --- a/debian/rules.patch +++ b/debian/rules.patch -@@ -221,9 +221,13 @@ debian_patches += arm-multilib-defaults +@@ -222,9 +222,13 @@ debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-fixes diff -Nru cross-gcc-173/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-175/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-173/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 39eab59bc529edb698135beac35616d5bfa767eb Mon Sep 17 00:00:00 2001 +From 437acc15d1da6cbd5d7b4387c49c2c372bad35e7 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,7 +13,7 @@ 5 files changed, 82 insertions(+), 17 deletions(-) diff --git a/debian/rules.conf b/debian/rules.conf -index 8f38a77..667f927 100644 +index 3736401..e6b475e 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -667,7 +667,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 34939c0..e14ff6c 100644 +index aa93ae5..5dc64a6 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -209,6 +209,9 @@ else @@ -120,7 +120,7 @@ with_multiarch_cxxheaders := yes endif endif -@@ -2009,12 +2023,13 @@ stamp-dir: +@@ -2013,12 +2027,13 @@ stamp-dir: mkdir -p $(stampdir) ifeq ($(DEB_CROSS),yes) @@ -137,7 +137,7 @@ if [ -f debian/$(1).substvars ]; then \ sed -i \ -e 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' \ -@@ -2023,7 +2038,13 @@ ifeq ($(DEB_CROSS),yes) +@@ -2027,7 +2042,13 @@ ifeq ($(DEB_CROSS),yes) $(if $(filter armhf,$(DEB_TARGET_ARCH)),-e 's/:armel/-armel-cross/g') \ debian/$(1).substvars; \ fi @@ -153,10 +153,10 @@ define cross_mangle_shlibs endef diff --git a/debian/rules2 b/debian/rules2 -index d5f27d4..26fa7c4 100644 +index a17ebc0..5323434 100644 --- a/debian/rules2 +++ b/debian/rules2 -@@ -756,8 +756,11 @@ CONFARGS += \ +@@ -757,8 +757,11 @@ CONFARGS += \ ifeq ($(DEB_CROSS),yes) CONFARGS += \ @@ -169,7 +169,7 @@ endif ifeq ($(with_bootstrap),off) -@@ -902,21 +905,33 @@ endif +@@ -903,21 +906,33 @@ endif # PFL is the installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds ifeq ($(DEB_CROSS),yes) @@ -206,7 +206,7 @@ else libdir = lib/$(DEB_TARGET_MULTIARCH) endif -@@ -942,7 +957,9 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS) +@@ -943,7 +958,9 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS) gcc_subdir_name = gcc ifneq ($(single_package),yes) ifeq ($(DEB_CROSS),yes) @@ -217,7 +217,7 @@ endif endif -@@ -964,7 +981,11 @@ d_l= debian/$(p_l) +@@ -965,7 +982,11 @@ d_l= debian/$(p_l) d_d= debian/$(p_d) ifeq ($(DEB_CROSS),yes) @@ -230,7 +230,7 @@ else usr_lib = $(PFL)/$(libdir) endif -@@ -1824,9 +1845,16 @@ ifeq ($(if $(filter yes,$(DEB_CROSS)),$(if $(filter rtlibs,$(DEB_STAGE)),native, +@@ -1825,9 +1846,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 @@ -250,7 +250,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) -@@ -2530,6 +2558,8 @@ binary-indep: debian/indep_binaries.all +@@ -2531,6 +2559,8 @@ binary-indep: debian/indep_binaries.all fi ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32el)) @@ -259,7 +259,7 @@ for p in `cat debian/indep_binaries debian/indep_binaries.epoch`; do \ p=$${p#-p*}; \ case "$$p" in \ -@@ -2537,6 +2567,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 +@@ -2538,6 +2568,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-173/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-175/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-173/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 9603224d140cd833ac42cb5a731b260546fc0fd0 Mon Sep 17 00:00:00 2001 +From b7e18d05682ce4a223fd0a081c5b837643e1522d 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 @@ -9,7 +9,7 @@ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/debian/rules.defs b/debian/rules.defs -index e14ff6c..0865229 100644 +index 5dc64a6..7f9d900 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -40,23 +40,7 @@ vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) diff -Nru cross-gcc-173/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-175/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-173/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0007-Skip-libjit-when-we-re-cross-building.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 163307d2c50e2f78ce98f252d747bf238ef0f308 Mon Sep 17 00:00:00 2001 +From 541a4edca99cf387f8e76ac916d5f0847cbb76e3 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 @@ -8,7 +8,7 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules.defs b/debian/rules.defs -index 0865229..3a24e36 100644 +index 7f9d900..ce27f84 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -621,7 +621,9 @@ endif diff -Nru cross-gcc-173/patches/gcc-8/0008-g-include-directories-functional-again.patch cross-gcc-175/patches/gcc-8/0008-g-include-directories-functional-again.patch --- cross-gcc-173/patches/gcc-8/0008-g-include-directories-functional-again.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0008-g-include-directories-functional-again.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 057f3347ad408fd4eb6d28e6a4c7ea001528ff05 Mon Sep 17 00:00:00 2001 +From f4f236a6f6c710567b9d967b40f1e4a656e0f40f 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 d072105..125a97e 100644 +index 29e82b8..04f853b 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-173/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-175/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-173/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From be1a73e603fd6b12d54c1a31e4d21d830b0f9988 Mon Sep 17 00:00:00 2001 +From 53815e5f8aa7293a89ef3d43ebdaeaa21a62b1b2 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-173/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-175/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-173/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-01-27 05:26:08.000000000 +0000 +++ cross-gcc-175/patches/gcc-8/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2018-02-18 22:49:49.000000000 +0000 @@ -1,4 +1,4 @@ -From 38748c0907bef88a0fea2f73f272139dc6603bc5 Mon Sep 17 00:00:00 2001 +From a85ec53a40442b01a6bdd353ef665029e2c4abfd 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