Package: cross-gcc-dev
Version: 184
Severity: important
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
The recent gcc-7 and gcc-8 uploads add a feature called
FORCE_CROSS_LAYOUT. After these uploads, the cross-gcc-dev patches still
apply, but they apply in a useless way. Part of their effect is moved
from the cross compiler branch to the new FORCE_CROSS_LAYOUT branch and
thus rendered ineffective. The attached patch fixes that.
Helmut
--- cross-gcc-184/debian/changelog
+++ cross-gcc-184+nmu1/debian/changelog
@@ -1,3 +1,10 @@
+cross-gcc (184+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for FORCE_CROSS_LAYOUT. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 03 Apr 2018 21:34:54 +0200
+
cross-gcc (184) unstable; urgency=medium
* rebuild for 8-20180331-1
---
cross-gcc-184/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch
+++
cross-gcc-184+nmu1/patches/gcc-7/0005-setting-all-the-various-paths-options-for-with_deps_.patch
@@ -83,11 +83,18 @@
index caa8b5e..e9eaf0f 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
-@@ -209,6 +209,9 @@ else
+@@ -209,10 +209,16 @@ else
# cross compiler, sets WITH_SYSROOT on it's own
DEB_CROSS = yes
build_type = build-cross
+ ifeq ($(with_deps_on_target_arch_pkgs),yes)
++ with_sysroot = /
++ endif
+ else ifeq ($(FORCE_CROSS_LAYOUT),yes)
+ # a native build with a cross layout
+ DEB_CROSS = yes
+ build_type = build-cross
++ ifeq ($(with_deps_on_target_arch_pkgs),yes)
+ with_sysroot = /
+ endif
else
---
cross-gcc-184/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch
+++
cross-gcc-184+nmu1/patches/gcc-8/0005-setting-all-the-various-paths-options-for-with_deps_.patch
@@ -83,11 +83,18 @@
index c63af56..3690f1b 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
-@@ -209,6 +209,9 @@ else
+@@ -209,10 +209,16 @@ else
# cross compiler, sets WITH_SYSROOT on it's own
DEB_CROSS = yes
build_type = build-cross
+ ifeq ($(with_deps_on_target_arch_pkgs),yes)
++ with_sysroot = /
++ endif
+ else ifeq ($(FORCE_CROSS_LAYOUT),yes)
+ # a native build with a cross layout
+ DEB_CROSS = yes
+ build_type = build-cross
++ ifeq ($(with_deps_on_target_arch_pkgs),yes)
+ with_sysroot = /
+ endif
else
