Bug#745116: src:gcc-4.8: DEB_CROSS_NO_BIARCH=yes ignored for DEB_TARGET_ARCH=hppa

[Helmut Grohne <helmut@subdivi.de>]

Package: src:gcc-4.8
Version: 4.8.2-19
Severity: normal
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

I noticed that a DEB_TARGET_ARCH=hppa build with DEB_CROSS_NO_BIARCH=yes
would try to build for hppa64 as well. The attached patch flips the
default of with_hppa64 for this particular case.

Helmut

diff -u gcc-4.8-4.8.2/debian/changelog gcc-4.8-4.8.2/debian/changelog
--- gcc-4.8-4.8.2/debian/changelog
+++ gcc-4.8-4.8.2/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.8 (4.8.2-19.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Honour DEB_CROSS_NO_BIARCH for hppa by not building for hppa64.
+    (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Fri, 18 Apr 2014 06:07:09 +0200
+
 gcc-4.8 (4.8.2-19) unstable; urgency=medium
 
   * Update to SVN 20140404 (r209122) from the gcc-4_8-branch.
diff -u gcc-4.8-4.8.2/debian/rules.defs gcc-4.8-4.8.2/debian/rules.defs
--- gcc-4.8-4.8.2/debian/rules.defs
+++ gcc-4.8-4.8.2/debian/rules.defs
@@ -1138,7 +1138,11 @@
   # hppa64 build ----------------
   hppa64_no_snap := no
   ifeq ($(DEB_TARGET_ARCH),hppa)
-    with_hppa64 := yes
+    ifdef DEB_CROSS_NO_BIARCH
+      with_hppa64 := disabled by DEB_CROSS_NO_BIARCH
+    else
+      with_hppa64 := yes
+    endif
   endif
   ifeq ($(hppa64_no_snap)-$(trunk_build),yes-yes)
     with_hppa64 := disabled for snapshot build