Bug#742358: src:gcc-4.8: DEB_CROSS_NO_BIARCH=yes ignored for DEB_TARGET_ARCH=x32

[Helmut Grohne <helmut@subdivi.de>]

Package: src:gcc-4.8
Version: 4.8.2-17
Severity: normal
Tags: patch

When building a cross compiler DEB_CROSS_NO_BIARCH=yes is ignored if
DEB_TARGET_ARCH=x32. In other words, it becomes a multilib build even
though a non-multilib build was requested. The attached patch solves the
issue for me.

Helmut

diff -u gcc-4.8-4.8.2/debian/rules2 gcc-4.8-4.8.2/debian/rules2
--- gcc-4.8-4.8.2/debian/rules2
+++ gcc-4.8-4.8.2/debian/rules2
@@ -334,7 +334,7 @@
     endif
 endif
 
-ifneq (,\$(filter \$(DEB_TARGET_GNU_TYPE), x86_64-linux-gnu x86_64-kfreebsd-gnu s390x-linux-gnu))
+ifneq (,\$(filter \$(DEB_TARGET_GNU_TYPE), x86_64-linux-gnu x86_64-linux-gnux32 x86_64-kfreebsd-gnu s390x-linux-gnu))
     ifneq (\$(biarch32),yes)
       CONFARGS += --disable-multilib
     endif