[mupen64plus] 110/262: Set host architecture to support build of i386 running on x86_64 kernel

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit f7266efb1d65d4803433ccfc5e9900f69a69241d
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Sep 2 11:01:57 2009 +0200

    Set host architecture to support build of i386 running on x86_64 kernel
---
 debian/changelog | 8 ++++++++
 debian/rules     | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8302e79..d02d6bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus (1.5+dfsg1-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - Set host architecture to support build of i386 running on x86_64 kernel
+      (Closes: #544670)
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Wed, 02 Sep 2009 10:57:51 +0200
+
 mupen64plus (1.5+dfsg1-2) unstable; urgency=low
 
   * debian/patches
diff --git a/debian/rules b/debian/rules
index c52b424..eae1bd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ endif
 ifeq ($(DEB_HOST_ARCH), kfreebsd-amd64)
 NOASM := 0
 endif
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 
 %:
 	dh --with quilt $@
@@ -31,7 +32,7 @@ clean:
 
 override_dh_auto_build:
 	mkdir -p $(CURDIR)/plugins
-	LDFLAGS='-Wl,--as-needed' $(MAKE) NO_ASM=$(NOASM) DBGSYM=1 DBG=1 all
+	LDFLAGS='-Wl,--as-needed' $(MAKE) NO_ASM=$(NOASM) UNAME='$(DEB_HOST_GNU_CPU)' DBGSYM=1 DBG=1 all
 
 override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr/ LIBDIR=/usr/lib/mupen64plus/ BINDIR=/usr/games/ install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git