[mupen64plus] 112/262: Don't set NO_ASM parameter anymore

[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 3a586c2ba9dd0a15237279b741f0e74208f699d6
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Sep 2 12:36:15 2009 +0200

    Don't set NO_ASM parameter anymore
---
 debian/changelog |  2 ++
 debian/rules     | 16 +---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfbbcc1..689ff44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ 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)
+    - Don't set NO_ASM parameter anymore as it is handled by
+      119-debian-archs.patch
   * debian/patches:
     - Add 119-debian-archs.patch, Define wordsize and endianess of
       architectures supported by debian (Closes: #544673)
diff --git a/debian/rules b/debian/rules
index eae1bd5..2c00aed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-NOASM := 1
-ifeq ($(DEB_HOST_ARCH), i386)
-NOASM := 0
-endif
-ifeq ($(DEB_HOST_ARCH), amd64)
-NOASM := 0
-endif
-ifeq ($(DEB_HOST_ARCH), kfreebsd-i386)
-NOASM := 0
-endif
-ifeq ($(DEB_HOST_ARCH), kfreebsd-amd64)
-NOASM := 0
-endif
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 
 %:
@@ -32,7 +18,7 @@ clean:
 
 override_dh_auto_build:
 	mkdir -p $(CURDIR)/plugins
-	LDFLAGS='-Wl,--as-needed' $(MAKE) NO_ASM=$(NOASM) UNAME='$(DEB_HOST_GNU_CPU)' DBGSYM=1 DBG=1 all
+	LDFLAGS='-Wl,--as-needed' $(MAKE) 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