Source: libffado
Version: 2.2.1-2
Followup-For: Bug #778777
Hi,
I just wondered about this and forgot to see beforehand whether a
bugreport already existed, so my patch differs. It’s shorter, less
intrusive and more in the spirit of the original code though, I
think, so I’m attaching it.
I’ve built this and uploaded it to unreleased, so please apply and
forward upstream.
-- System Information:
Debian Release: stretch/sid
APT prefers unreleased
APT policy: (500, 'unreleased'), (500, 'buildd-unstable'), (500, 'unstable')
Architecture: x32 (x86_64)
Foreign Architectures: i386, amd64
Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/lksh
Init: sysvinit (via /sbin/init)
diff -Nru libffado-2.2.1/debian/changelog libffado-2.2.1/debian/changelog
--- libffado-2.2.1/debian/changelog 2014-07-07 18:38:49.000000000 +0200
+++ libffado-2.2.1/debian/changelog 2015-06-11 10:29:13.000000000 +0200
@@ -1,3 +1,10 @@
+libffado (2.2.1-2+x32.1) unreleased; urgency=medium
+
+ * Non-maintainer upload.
+ * Add x32 patch
+
+ -- Thorsten Glaser <t...@mirbsd.de> Thu, 11 Jun 2015 10:29:03 +0200
+
libffado (2.2.1-2) unstable; urgency=medium
* Team upload.
diff -Nru libffado-2.2.1/debian/patches/series libffado-2.2.1/debian/patches/series
--- libffado-2.2.1/debian/patches/series 2014-07-07 18:36:52.000000000 +0200
+++ libffado-2.2.1/debian/patches/series 2015-06-11 10:26:42.000000000 +0200
@@ -1 +1,2 @@
cpuinfo-parsing.patch
+x32.patch
diff -Nru libffado-2.2.1/debian/patches/x32.patch libffado-2.2.1/debian/patches/x32.patch
--- libffado-2.2.1/debian/patches/x32.patch 1970-01-01 01:00:00.000000000 +0100
+++ libffado-2.2.1/debian/patches/x32.patch 2015-06-11 10:28:57.000000000 +0200
@@ -0,0 +1,16 @@
+# DP: x86 i386/x32/amd64 is like MIPS o32/n32/n64, not biarch multilib
+
+--- a/SConstruct
++++ b/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'] }
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
