Bug#771383: gcc-4.9: Please revert disabling of DEB_CROSS_NO_BIARCH builds
Package: gcc-4.9
Version: 4.9.2-3
Severity: normal
Tags: patch
gcc 4.9.1-19 removed the top-level option to set no_biarch_libs = yes when building crosscompilers.
-ifdef DEB_CROSS_NO_BIARCH
- no_biarch_libs := yes
-endif
+no_biarch_libs :=
Then 4.9.2-2 removed another related stanza
- ifdef DEB_CROSS_NO_BIARCH
- biarch64 := disabled by DEB_CROSS_NO_BIARCH
- biarch32 := disabled by DEB_CROSS_NO_BIARCH
- biarchn32 := disabled by DEB_CROSS_NO_BIARCH
- biarchx32 := disabled by DEB_CROSS_NO_BIARCH
- biarchhf := disabled by DEB_CROSS_NO_BIARCH
- biarchsf := disabled by DEB_CROSS_NO_BIARCH
- endif
This code has been present for a long time, was working fine until
its recent removal, and is still used by cross-toolchains built for
debian. This change means that current cross-gcc-4.9-* packages can no
longer build unpatched gcc-4.9 so must carry the attached reversion
patch.
Everyone agrees that building cross packages from unpatched gcc-4.9 is
a worthy goal, so please revert this change.
# Debug: #766924
Index: cross-gcc/debian/rules.defs
===================================================================
--- cross-gcc.orig/debian/rules.defs
+++ cross-gcc/debian/rules.defs
@@ -1447,7 +1444,9 @@
#ifeq ($(trunk_build),yes)
# no_biarch_libs := yes
#endif
-no_biarch_libs :=
+ifdef DEB_CROSS_NO_BIARCH
+ no_biarch_libs := yes
+endif
ifeq ($(no_biarch_libs),yes)
with_lib64gcc := no
@@ -1608,6 +1606,15 @@ ifeq ($(no_biarch_libs),yes)
with_java_plugin := no
+ ifdef DEB_CROSS_NO_BIARCH
+ biarch64 := disabled by DEB_CROSS_NO_BIARCH
+ biarch32 := disabled by DEB_CROSS_NO_BIARCH
+ biarchn32 := disabled by DEB_CROSS_NO_BIARCH
+ biarchx32 := disabled by DEB_CROSS_NO_BIARCH
+ biarchhf := disabled by DEB_CROSS_NO_BIARCH
+ biarchsf := disabled by DEB_CROSS_NO_BIARCH
+ endif
+
ifeq ($(with_ada)-$(with_separate_gnat),yes-yes)
biarchhf := disabled for Ada
biarchsf := disabled for Ada
Reply to: