[SCM] ffado/master: Fix FTBFS on x32

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8386e2d0413266458062e5d70049d905e26e5ef8
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Feb 15 01:32:20 2016 +0000

    Fix FTBFS on x32
    
    Closes: #778777
    Thanks: Thorsten Glaser for the patch

diff --git a/debian/patches/series b/debian/patches/series
index a1ed25d..d2f9217 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 cpuinfo-parsing.patch
+x32.patch
diff --git a/debian/patches/x32.patch b/debian/patches/x32.patch
new file mode 100644
index 0000000..ce051f1
--- /dev/null
+++ b/debian/patches/x32.patch
@@ -0,0 +1,22 @@
+Description: Fix FTBFS on x32
+ x86 i386/x32/amd64 is like MIPS o32/n32/n64, not biarch multilib
+Bug-Debian: #778777
+Author: Thorsten Glaser <t.glaser at tarent.de>
+---
+ SConstruct |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- ffado.orig/SConstruct
++++ ffado/SConstruct
+@@ -760,7 +760,10 @@ if cpuinfo.is_powerpc:
+ elif cpuinfo.is_x86:
+     if m32:
+         print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+-        machineflags = { 'CXXFLAGS' : ['-m32'] }
++        if cpuinfo.machine == 'x86_64':
++            machineflags = { 'CXXFLAGS' : ['-mx32'] }
++        else:
++            machineflags = { 'CXXFLAGS' : ['-m32'] }
+     else:
+         print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+         machineflags = { 'CXXFLAGS' : ['-m64'] }

-- 
Free Firewire Audio Drivers (ffado.org) packaging