From ba5bb6aa53e9e40728b331a1b7db11fce815cccb Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 28 Nov 2014 21:54:51 -0800
Subject: [PATCH 3/5] allow-no-biarch

---
 debian/rules.defs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/rules.defs b/debian/rules.defs
index 8d74818..714f95d 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1453,7 +1453,9 @@ $(foreach x,32 64 n32 x32 hf sf,$(eval $(call gen_biarch,$(x))))
 #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
@@ -1602,6 +1604,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
-- 
2.0.0