[SCM] jackd2/master: Build with --mixed on i386 to be compatible with amd64.

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 72827ee0da2a23cdb1bb9d7e284b9edb750ae078
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Mar 21 10:34:29 2011 +0100

    Build with --mixed on i386 to be compatible with amd64.
    
    jackd2 on amd64 is built with --mixed turned on, so a 32bit library will
    be created during the amd64 build process. However, we don't ship this
    i386 library in the amd64 package but expect users to install the i386
    version from the archive (apt-ia32 or chroot approach).
    
    The i386 lib uses a different memory layout (4-byte align instead of
    8-byte), thus breaking the whole magic. With --mixed also enabled on
    i386, the i386 lib will use the same alignment as on amd64. Though this
    might slightly increase the runtime memory footprint, it at least
    enables users to run i386 jack clients on amd64 jackd servers.
    
    We might want to have a look at this issue again once the new multiarch
    strategy is fully set.

diff --git a/debian/rules b/debian/rules
index d3ba066..5fcbb16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ waf-configure-options = --prefix=/usr --classic --dbus
 waf-configure-options += $(if $(filter linux,$(DEB_HOST_ARCH_OS)),--alsa)
 waf-configure-options += $(if $(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)),--firewire)
 waf-configure-options += $(if $(filter amd64,$(DEB_HOST_ARCH)),--mixed)
+waf-configure-options += $(if $(filter i386,$(DEB_HOST_ARCH)),--mixed)
 
 DEB_MAKE_INVOKE = ./waf -v --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install

-- 
jackd2 packaging