diff -Nru cross-gcc-116/cross-gcc-dev-helpers.sh cross-gcc-117/cross-gcc-dev-helpers.sh --- cross-gcc-116/cross-gcc-dev-helpers.sh 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/cross-gcc-dev-helpers.sh 2017-02-08 07:22:23.000000000 +0000 @@ -8,9 +8,9 @@ # These lines are modified by auto_build_all.sh. Do NOT change the structure of # these so that the script can keep working known_debian_gcc_releases[4.9]="4.9.4-2" -known_debian_gcc_releases[5]="5.4.1-4" -known_debian_gcc_releases[6]="6.3.0-5" -known_debian_gcc_releases[7]="7-20170121-1" +known_debian_gcc_releases[5]="5.4.1-5" +known_debian_gcc_releases[6]="6.3.0-6" +known_debian_gcc_releases[7]="7-20170129-1" # bash and zsh get associative array keys differently diff -Nru cross-gcc-116/debian/changelog cross-gcc-117/debian/changelog --- cross-gcc-116/debian/changelog 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/debian/changelog 2017-02-08 07:22:23.000000000 +0000 @@ -1,3 +1,11 @@ +cross-gcc (117) unstable; urgency=medium + + * rebuild for 5.4.1-5 + * rebuild for 6.3.0-6 + * rebuild for 7-20170129-1 + + -- Dima Kogan Tue, 07 Feb 2017 23:22:23 -0800 + cross-gcc (116) unstable; urgency=medium * rebuild for 7-20170121-1 diff -Nru cross-gcc-116/patches/gcc-5/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-117/patches/gcc-5/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-116/patches/gcc-5/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From f56919ad65bee591e89c1f482d7c6d6801a1bda4 Mon Sep 17 00:00:00 2001 +From 28f636857af4cf5909dca74a18107bf1a0dd7f9a Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 01/11] Allowing with_deps_on_target_arch_deps again @@ -23,5 +23,5 @@ #with_unversioned = yes -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-117/patches/gcc-5/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-116/patches/gcc-5/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 18268601975d901ab534e96b395e67c8ca14b2fd Mon Sep 17 00:00:00 2001 +From 095a526b606a9e44d6cef1e5947fc2ca3c008d4a Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 02/11] added DEB_CROSS_NO_BIARCH option to disable biarch @@ -40,5 +40,5 @@ biarchhf := disabled for Ada biarchsf := disabled for Ada -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-117/patches/gcc-5/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-116/patches/gcc-5/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 975e2c933d102afa5f2c0a29271d0dfbaf8275ab Mon Sep 17 00:00:00 2001 +From 47c09145f239f23d4b502c1f7bb3a20e85064be1 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 03/11] Compilers now depend on cpp instead of gcc-base @@ -33,7 +33,7 @@ Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libdbgdep(gfortran`'FORTRAN_SO-dbg,) BUILT_USING`'dnl diff --git a/debian/rules.conf b/debian/rules.conf -index 7727399..596e8d8 100644 +index 87ba1d4..3467cb6 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1288,6 +1288,8 @@ endif @@ -46,5 +46,5 @@ ifeq ($(with_libphobos),yes) echo 'dep:phobosdev=libphobos$(pkg_ver)-dev$(LS)$(AQ) (>= $(DEB_GCC_SOFT_VERSION))' \ -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-117/patches/gcc-5/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-116/patches/gcc-5/0004-added-multi-arch-specific-install-location-patch.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0004-added-multi-arch-specific-install-location-patch.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 82fb94c27f4ded905c6083b5800dc65fe5bf9c43 Mon Sep 17 00:00:00 2001 +From 056a280af185353131d9f2a03bd3f2cca98c6e5d Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Mon, 15 Dec 2014 14:48:09 -0800 Subject: [PATCH 04/11] added multi-arch-specific install-location patch @@ -440,10 +440,10 @@ + case $multi_os_directory in + .) ;; # Avoid trailing /. diff --git a/debian/rules.patch b/debian/rules.patch -index fe6dec6..1833235 100644 +index 9b2a07f..31c5726 100644 --- a/debian/rules.patch +++ b/debian/rules.patch -@@ -282,9 +282,13 @@ debian_patches += arm-multilib-defaults +@@ -281,9 +281,13 @@ debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-fixes @@ -461,5 +461,5 @@ endif -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-117/patches/gcc-5/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-116/patches/gcc-5/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 0ae88914f53aab9e3863b54743f046a1fde14872 Mon Sep 17 00:00:00 2001 +From f4af0e5cdddf96b03362ae9bea904e9b9e152dd8 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sun, 3 May 2015 19:28:33 -0700 Subject: [PATCH 05/11] 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 596e8d8..db6af16 100644 +index 3467cb6..1aac22b 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -713,7 +713,9 @@ ifeq ($(DEB_CROSS),yes) @@ -153,7 +153,7 @@ define cross_mangle_shlibs endef diff --git a/debian/rules2 b/debian/rules2 -index cc275af..e1252ad 100644 +index 06a5774..9e166da 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -779,8 +779,11 @@ CONFARGS += \ @@ -268,5 +268,5 @@ dh_installdeb $(foreach p,$(shell echo `cat debian/indep_binaries.all`),-p$(p)) dh_md5sums $(foreach p,$(shell echo `cat debian/indep_binaries.all`),-p$(p)) -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-117/patches/gcc-5/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-116/patches/gcc-5/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 0d93b60a0153790b008b0d8be4650f88f924a13e Mon Sep 17 00:00:00 2001 +From 99aa688d9182c856b8ecb6eb656ff73156154a87 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 18 Dec 2014 14:39:19 -0800 Subject: [PATCH 06/11] Allow target selection via dpkg-buildpackage @@ -94,5 +94,5 @@ DEB_TARGET_GNU_TYPE := $(call vafilt,$(TARGET_VARS),DEB_HOST_GNU_TYPE) DEB_TARGET_GNU_SYSTEM := $(call vafilt,$(TARGET_VARS),DEB_HOST_GNU_SYSTEM) -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-117/patches/gcc-5/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-116/patches/gcc-5/0007-Skip-libjit-when-we-re-cross-building.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0007-Skip-libjit-when-we-re-cross-building.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 4ff067cd644a5258fe6aced0212c276818c9a409 Mon Sep 17 00:00:00 2001 +From 09549609719f012fb3340f89ab6a07b43a2001a0 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Mon, 27 Apr 2015 11:08:31 -0700 Subject: [PATCH 07/11] Skip libjit when we're cross-building @@ -23,5 +23,5 @@ # FIXME: compiler bug jit_no_cpus := ia64 -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0008-g-include-directories-functional-again.patch cross-gcc-117/patches/gcc-5/0008-g-include-directories-functional-again.patch --- cross-gcc-116/patches/gcc-5/0008-g-include-directories-functional-again.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0008-g-include-directories-functional-again.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 9aba3415293f60db817340febe3246bd7d142f91 Mon Sep 17 00:00:00 2001 +From 815a9cb32f9840aeb1301dd65ad60ad66b9c6360 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Wed, 29 Apr 2015 16:56:53 -0700 Subject: [PATCH 08/11] g++ include directories functional again @@ -53,5 +53,5 @@ +- fi + fi -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0009-made-unstripped_exe-setting-overridable.patch cross-gcc-117/patches/gcc-5/0009-made-unstripped_exe-setting-overridable.patch --- cross-gcc-116/patches/gcc-5/0009-made-unstripped_exe-setting-overridable.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0009-made-unstripped_exe-setting-overridable.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From ba00494da831f7690f4651bbc0e785c570ccaa5c Mon Sep 17 00:00:00 2001 +From f4ed57c4502911cf0120c82081d5953b5a648bd8 Mon Sep 17 00:00:00 2001 From: Wookey Date: Sun, 10 May 2015 11:10:18 -0700 Subject: [PATCH 09/11] made 'unstripped_exe' setting overridable. @@ -21,5 +21,5 @@ # common things --------------- # build common packages, where package names don't differ in different -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-117/patches/gcc-5/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-116/patches/gcc-5/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From aeee6c0358beb59c12610adb92f978a3fcb970f8 Mon Sep 17 00:00:00 2001 +From d5594a5be2e8887eb59651e630afe59f2421cf1f Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 26 May 2015 01:12:13 -0700 Subject: [PATCH 10/11] gcc-...-base dependencies reverted to gcc-VER-base when @@ -43,5 +43,5 @@ Multi-Arch: same Section: ifdef(`TARGET',`devel',`libs') -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-5/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-117/patches/gcc-5/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-116/patches/gcc-5/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-5/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 0e5432fd0c90699122ee03c1a20c5c42d2609025 Mon Sep 17 00:00:00 2001 +From 6323bd77ed36680100e615cb3c130fe0b8cdf6f5 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 9 Jun 2015 02:13:04 -0700 Subject: [PATCH 11/11] 'base' now part of lib_binaries again, not @@ -29,5 +29,5 @@ ifneq ($(with_base_only),yes) indep_binaries += lbase -- -2.8.1 +2.11.0 diff -Nru cross-gcc-116/patches/gcc-6/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-117/patches/gcc-6/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-116/patches/gcc-6/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From d8d3833a15e7b50962c68222d96ada413dca70d9 Mon Sep 17 00:00:00 2001 +From 6b52d72d326104d5f4702c95bfb71448ce33a52d Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 01/11] 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 8b081b9..05b92c6 100644 +index 6543efc..b9c2df8 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -178,9 +178,6 @@ ifeq ($(DEB_TARGET_ARCH),) diff -Nru cross-gcc-116/patches/gcc-6/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-117/patches/gcc-6/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-116/patches/gcc-6/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 5c6b6afa30949886c10d83dfc5c0d5960f43209d Mon Sep 17 00:00:00 2001 +From 4b017b1926e497f45a5d1ba3060c732048a84f72 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 02/11] 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 05b92c6..654ac72 100644 +index b9c2df8..8171bf8 100644 --- a/debian/rules.defs +++ b/debian/rules.defs -@@ -1725,7 +1725,9 @@ export biarch_multidir_names +@@ -1726,7 +1726,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 -@@ -1882,6 +1884,15 @@ ifeq ($(no_biarch_libs),yes) +@@ -1883,6 +1885,15 @@ ifeq ($(no_biarch_libs),yes) with_java_plugin := no diff -Nru cross-gcc-116/patches/gcc-6/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-117/patches/gcc-6/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-116/patches/gcc-6/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 4cce665e0bcb8e03ea55365533c4cf15f6bfba56 Mon Sep 17 00:00:00 2001 +From b8dc2aa74f433b006f24877babc7715772f688c2 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Fri, 28 Nov 2014 21:54:51 -0800 Subject: [PATCH 03/11] Compilers now depend on cpp instead of gcc-base diff -Nru cross-gcc-116/patches/gcc-6/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-117/patches/gcc-6/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-116/patches/gcc-6/0004-added-multi-arch-specific-install-location-patch.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0004-added-multi-arch-specific-install-location-patch.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 4b6e7d0d44f22651c78f9f0e50fa99b8178f7308 Mon Sep 17 00:00:00 2001 +From 675d5764f0f6f9e944057f805f5c8a75e4e3545d Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Mon, 15 Dec 2014 14:48:09 -0800 Subject: [PATCH 04/11] added multi-arch-specific install-location patch @@ -440,10 +440,10 @@ + case $multi_os_directory in + .) ;; # Avoid trailing /. diff --git a/debian/rules.patch b/debian/rules.patch -index 1219ca3..db9621d 100644 +index 68205c6..68c6d99 100644 --- a/debian/rules.patch +++ b/debian/rules.patch -@@ -296,9 +296,13 @@ debian_patches += arm-multilib-defaults +@@ -295,9 +295,13 @@ debian_patches += arm-multilib-defaults ifeq ($(DEB_CROSS),yes) debian_patches += cross-fixes diff -Nru cross-gcc-116/patches/gcc-6/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-117/patches/gcc-6/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-116/patches/gcc-6/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From dc144e4ea83fa00198c325224023104ad4371753 Mon Sep 17 00:00:00 2001 +From 2431684c09d70416d4b3e7c00da60a0f0ee453a6 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sun, 3 May 2015 19:28:33 -0700 Subject: [PATCH 05/11] setting all the various paths, options for @@ -80,7 +80,7 @@ dh_strip -p$(p_cpp) \ diff --git a/debian/rules.defs b/debian/rules.defs -index 654ac72..a38bbda 100644 +index 8171bf8..ee33040 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -200,6 +200,9 @@ else @@ -120,7 +120,7 @@ with_multiarch_cxxheaders := yes endif endif -@@ -2060,12 +2074,13 @@ stamp-dir: +@@ -2061,12 +2075,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' \ -@@ -2074,7 +2089,13 @@ ifeq ($(DEB_CROSS),yes) +@@ -2075,7 +2090,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 2fdc700..5f09cc4 100644 +index 1914d30..f81eab2 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -738,8 +738,11 @@ CONFARGS += \ diff -Nru cross-gcc-116/patches/gcc-6/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-117/patches/gcc-6/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-116/patches/gcc-6/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 3c89db2d2b98aaab8ff2123e1bd009248b4c6240 Mon Sep 17 00:00:00 2001 +From 268f2b597bf92ff138c037cc55c063af6c897bdc Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 18 Dec 2014 14:39:19 -0800 Subject: [PATCH 06/11] 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 a38bbda..a1468ee 100644 +index ee33040..d159b34 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -39,23 +39,7 @@ vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) diff -Nru cross-gcc-116/patches/gcc-6/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-117/patches/gcc-6/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-116/patches/gcc-6/0007-Skip-libjit-when-we-re-cross-building.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0007-Skip-libjit-when-we-re-cross-building.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From b0f9560116c83d65dafb23442751665c323d5581 Mon Sep 17 00:00:00 2001 +From 2134081783ae270c05f6e1367ca0f8a80e99ad7b Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Mon, 27 Apr 2015 11:08:31 -0700 Subject: [PATCH 07/11] 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 a1468ee..42f438e 100644 +index d159b34..26b397e 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -578,7 +578,9 @@ endif diff -Nru cross-gcc-116/patches/gcc-6/0008-g-include-directories-functional-again.patch cross-gcc-117/patches/gcc-6/0008-g-include-directories-functional-again.patch --- cross-gcc-116/patches/gcc-6/0008-g-include-directories-functional-again.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0008-g-include-directories-functional-again.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From b7be1ff1956fa06d333d0a17c52ca2df15bbe2db Mon Sep 17 00:00:00 2001 +From eedd7d9840958bb6464970d98637589bf8958753 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Wed, 29 Apr 2015 16:56:53 -0700 Subject: [PATCH 08/11] g++ include directories functional again diff -Nru cross-gcc-116/patches/gcc-6/0009-made-unstripped_exe-setting-overridable.patch cross-gcc-117/patches/gcc-6/0009-made-unstripped_exe-setting-overridable.patch --- cross-gcc-116/patches/gcc-6/0009-made-unstripped_exe-setting-overridable.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0009-made-unstripped_exe-setting-overridable.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 9eef8328f7ebfab6793dcfdf9094cc845e64b8be Mon Sep 17 00:00:00 2001 +From 82ca07c6ca6bbbc1e1af6448cd82444309a1656d Mon Sep 17 00:00:00 2001 From: Wookey Date: Sun, 10 May 2015 11:10:18 -0700 Subject: [PATCH 09/11] made 'unstripped_exe' setting overridable. @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.defs b/debian/rules.defs -index 42f438e..0b671f9 100644 +index 26b397e..4031ded 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -416,7 +416,7 @@ endif diff -Nru cross-gcc-116/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-117/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-116/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 9debc365aea6203cf85845030deb451ce7f9588a Mon Sep 17 00:00:00 2001 +From a7d6881f1024464d5504c8157d3fe8745516b38d Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 26 May 2015 01:12:13 -0700 Subject: [PATCH 10/11] gcc-...-base dependencies reverted to gcc-VER-base when diff -Nru cross-gcc-116/patches/gcc-6/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-117/patches/gcc-6/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-116/patches/gcc-6/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-6/0011-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 4bf5fa9bd3c670d35d4630e73a4894bc55fc51f0 Mon Sep 17 00:00:00 2001 +From c6d5bdaadbbbb0e2a311e787901c841c18283300 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 9 Jun 2015 02:13:04 -0700 Subject: [PATCH 11/11] 'base' now part of lib_binaries again, not diff -Nru cross-gcc-116/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch cross-gcc-117/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch --- cross-gcc-116/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0001-Allowing-with_deps_on_target_arch_deps-again.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 4a9695bdf07acc253ba636685e54b69f9a1c22e4 Mon Sep 17 00:00:00 2001 +From 8c6b35f42c583928bfae3121455618a3728ec689 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 ecf368a..bd5c6b6 100644 +index 9619656..b16f2eb 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -178,9 +178,6 @@ ifeq ($(DEB_TARGET_ARCH),) diff -Nru cross-gcc-116/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch cross-gcc-117/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch --- cross-gcc-116/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0002-added-DEB_CROSS_NO_BIARCH-option-to-disable-biarch-s.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 1c1cdc0cd357f4f57a45872974cd6e47f6922303 Mon Sep 17 00:00:00 2001 +From 8e607b4d70898ed6cc96ca7e2ae81fd2b8a7da7a 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 bd5c6b6..28a3433 100644 +index b16f2eb..b0ac5c2 100644 --- a/debian/rules.defs +++ b/debian/rules.defs -@@ -1577,7 +1577,9 @@ export biarch_multidir_names +@@ -1599,7 +1599,9 @@ export biarch_multidir_names #ifeq ($(trunk_build),yes) # no_biarch_libs := yes #endif @@ -23,9 +23,9 @@ ifeq ($(no_biarch_libs),yes) with_lib64gcc := no -@@ -1726,6 +1728,15 @@ ifeq ($(no_biarch_libs),yes) - with_libsfgfortrandev := no +@@ -1754,6 +1756,15 @@ ifeq ($(no_biarch_libs),yes) with_libsfphobosdev := no + with_libsfhsailrtdev := no + ifdef DEB_CROSS_NO_BIARCH + biarch64 := disabled by DEB_CROSS_NO_BIARCH diff -Nru cross-gcc-116/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch cross-gcc-117/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch --- cross-gcc-116/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0003-Compilers-now-depend-on-cpp-instead-of-gcc-base.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 521789398a5cafe7f1614866b9f5bc522091001a Mon Sep 17 00:00:00 2001 +From 06d780a3744aa3ee24331ce530230b81d33f095c 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 @@ -11,7 +11,7 @@ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/control.m4 b/debian/control.m4 -index 4a4243d..12f6a25 100644 +index 85882da..e88e173 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -834,7 +834,7 @@ ifdef(`TARGET',`Multi-Arch: foreign @@ -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 6653e26..cf09b4e 100644 +index e3b8ea7..88250fe 100644 --- a/debian/rules.conf +++ b/debian/rules.conf -@@ -1148,6 +1148,8 @@ endif +@@ -1155,6 +1155,8 @@ endif ifeq ($(DEB_CROSS),yes) echo 'dep:gdccross=gdc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ >> debian/substvars.local.tmp diff -Nru cross-gcc-116/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch cross-gcc-117/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch --- cross-gcc-116/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0004-added-multi-arch-specific-install-location-patch.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 7fec519f82ba005f99f3a4ec7336e3d29cf2f8d6 Mon Sep 17 00:00:00 2001 +From 27878ae42850f077bc9e2368cefdc6b3463c6ef6 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 @@ -6,38 +6,17 @@ Added cross-ma-install-location.diff, a multiarch analogue or the existing cross-install-location.diff. Using this if with_deps_on_target_arch_pkgs --- - debian/patches/cross-ma-install-location.diff | 422 ++++++++++++++++++++++++++ + debian/patches/cross-ma-install-location.diff | 379 ++++++++++++++++++++++++++ debian/rules.patch | 10 +- - 2 files changed, 429 insertions(+), 3 deletions(-) + 2 files changed, 386 insertions(+), 3 deletions(-) create mode 100644 debian/patches/cross-ma-install-location.diff diff --git a/debian/patches/cross-ma-install-location.diff b/debian/patches/cross-ma-install-location.diff new file mode 100644 -index 0000000..ca7be69 +index 0000000..97117d6 --- /dev/null +++ b/debian/patches/cross-ma-install-location.diff -@@ -0,0 +1,422 @@ -+Index: b/src/boehm-gc/configure.ac -+=================================================================== -+--- a/src/boehm-gc/configure.ac -++++ b/src/boehm-gc/configure.ac -+@@ -498,14 +498,8 @@ -+ AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory]) -+ fi -+ -+-if test -n "$with_cross_host" && -+- test x"$with_cross_host" != x"no"; then -+- toolexecdir='$(exec_prefix)/$(target_noncanonical)' -+- toolexeclibdir='$(toolexecdir)/lib' -+-else -+- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' -+- toolexeclibdir='$(libdir)' -+-fi -++toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' -++toolexeclibdir='$(libdir)' -+ multi_os_directory=`$CC -print-multi-os-directory` -+ case $multi_os_directory in -+ .) ;; # Avoid trailing /. +@@ -0,0 +1,379 @@ +Index: b/src/libada/configure.ac +=================================================================== +--- a/src/libada/configure.ac @@ -200,28 +179,6 @@ + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) ;; # Avoid trailing /. -+Index: b/src/libjava/configure.ac -+=================================================================== -+--- a/src/libjava/configure.ac -++++ b/src/libjava/configure.ac -+@@ -1571,15 +1571,8 @@ -+ toolexeclibdir=$toolexecmainlibdir -+ ;; -+ no) -+- if test -n "$with_cross_host" && -+- test x"$with_cross_host" != x"no"; then -+- # Install a library built with a cross compiler in tooldir, not libdir. -+- toolexecdir='$(exec_prefix)/$(target_noncanonical)' -+- toolexecmainlibdir='$(toolexecdir)/lib' -+- else -+- toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' -+- toolexecmainlibdir='$(libdir)' -+- fi -++ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' -++ toolexecmainlibdir='$(libdir)' -+ multi_os_directory=`$CC -print-multi-os-directory` -+ case $multi_os_directory in -+ .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. +Index: b/src/libobjc/configure.ac +=================================================================== +--- a/src/libobjc/configure.ac @@ -440,7 +397,7 @@ + case $multi_os_directory in + .) ;; # Avoid trailing /. diff --git a/debian/rules.patch b/debian/rules.patch -index 5f45020..be81c1e 100644 +index 28015d7..826c8f7 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -213,9 +213,13 @@ debian_patches += arm-multilib-defaults diff -Nru cross-gcc-116/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch cross-gcc-117/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch --- cross-gcc-116/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From db10d03d08b8ac856e1bda2c58e683803d24681f Mon Sep 17 00:00:00 2001 +From 81db7e776e6ecf2e1d746b79ccdc5b3f72260a9f 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, 82 insertions(+), 17 deletions(-) diff --git a/debian/rules.conf b/debian/rules.conf -index cf09b4e..c0c0c05 100644 +index 88250fe..b8e5cb6 100644 --- a/debian/rules.conf +++ b/debian/rules.conf -@@ -640,7 +640,9 @@ ifeq ($(DEB_CROSS),yes) +@@ -636,7 +636,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 -@@ -1246,7 +1248,8 @@ parameters-file: +@@ -1254,7 +1256,8 @@ parameters-file: symbols-files: control-file ifeq ($(DEB_CROSS),yes) @@ -80,7 +80,7 @@ dh_strip -p$(p_cpp) \ diff --git a/debian/rules.defs b/debian/rules.defs -index 28a3433..c44737b 100644 +index b0ac5c2..585bbb3 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -200,6 +200,9 @@ else @@ -120,7 +120,7 @@ with_multiarch_cxxheaders := yes endif endif -@@ -1887,12 +1901,13 @@ stamp-dir: +@@ -1915,12 +1929,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' \ -@@ -1901,7 +1916,13 @@ ifeq ($(DEB_CROSS),yes) +@@ -1929,7 +1944,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 28fb1c1..439e9e3 100644 +index ace4157..5e8c9b1 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -687,8 +687,11 @@ CONFARGS += \ @@ -230,7 +230,7 @@ else usr_lib = $(PFL)/$(libdir) endif -@@ -1722,9 +1743,16 @@ ifneq ($(DEB_CROSS),yes) +@@ -1723,9 +1744,16 @@ ifneq ($(DEB_CROSS),yes) 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) -@@ -2362,6 +2390,8 @@ binary-indep: debian/indep_binaries.all +@@ -2383,6 +2411,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 \ -@@ -2370,6 +2400,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 +@@ -2391,6 +2421,7 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel mips64 mips64el mipsn32 mipsn32 esac; \ done endif diff -Nru cross-gcc-116/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch cross-gcc-117/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch --- cross-gcc-116/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0006-Allow-target-selection-via-dpkg-buildpackage-target-.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From 0a52fdb2da9626b9da71496d935c9cfb4e270bb3 Mon Sep 17 00:00:00 2001 +From 44b60d7beec5dfe3bee55cc2112f5d073f096548 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 c44737b..1319229 100644 +index 585bbb3..9643c18 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -39,23 +39,7 @@ vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) diff -Nru cross-gcc-116/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch cross-gcc-117/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch --- cross-gcc-116/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0007-Skip-libjit-when-we-re-cross-building.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From db88609af1b5b163d8368ef5d5e6188f60a0b04b Mon Sep 17 00:00:00 2001 +From bedd451e003ac3c10cd31471c4e160bb7b8cb045 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 1319229..a68d7b3 100644 +index 9643c18..946d215 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -562,7 +562,9 @@ endif diff -Nru cross-gcc-116/patches/gcc-7/0008-g-include-directories-functional-again.patch cross-gcc-117/patches/gcc-7/0008-g-include-directories-functional-again.patch --- cross-gcc-116/patches/gcc-7/0008-g-include-directories-functional-again.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0008-g-include-directories-functional-again.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From f24f7a49a6522cb64f782cc819975af59beed4e7 Mon Sep 17 00:00:00 2001 +From 47edbc49f1d4bef29404c64c23f0dd5f8e2bd8f8 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 e93b52f..824fc61 100644 +index e93b52f..55d4dbc 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 @@ -30,7 +30,7 @@ +@@ -141,9 +141,6 @@ + gcc_gxx_include_dir='${libsubdir}/include/c++' + else -+ libstdcxx_incdir='include/c++/$(BASEVER_c)' ++ libstdcxx_incdir='include/c++/$(version)' +- if test x$host != x$target; then +- libstdcxx_incdir="$target_alias/$libstdcxx_incdir" +- fi diff -Nru cross-gcc-116/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-117/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch --- cross-gcc-116/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0009-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From a771ffb9306230fdd62d1609b0747e60ee1fe1da Mon Sep 17 00:00:00 2001 +From eca4705773263bc5f9f3a3d9a5680fd05675650a 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 @@ -12,7 +12,7 @@ 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/control.m4 b/debian/control.m4 -index 12f6a25..2497b32 100644 +index e88e173..57ed991 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -122,12 +122,13 @@ Description: SNAPSHOT of the GNU Compiler Collection diff -Nru cross-gcc-116/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch cross-gcc-117/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch --- cross-gcc-116/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2017-01-30 03:25:10.000000000 +0000 +++ cross-gcc-117/patches/gcc-7/0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch 2017-02-08 07:22:23.000000000 +0000 @@ -1,4 +1,4 @@ -From e112f8440d2dfdeeec35aabc289cd2e8bce6548b Mon Sep 17 00:00:00 2001 +From 6c28e4e4aef9e03bab5b5d60f931bf459aaa3731 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