[SCM] clone of the legendary first person shooter Doom branch, master, updated. upstream/2.5.0+dfsg1-19-g1125a27

[Jon Dowland]

The following commit has been merged in the master branch:
commit 553ddf90337107a8fb514c9b431e4f697188cb3b
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Sep 3 15:45:59 2010 +0100

    disable i386 assembler

diff --git a/debian/rules b/debian/rules
index 5866956..a2a44f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,9 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --disable-cpu-opt --disable-dogs \
-		LDFLAGS="-Wl,--as-needed -Wl,-z,defs"
-#	--host=$(DEB_HOST_GNU_TYPE) --target=$(DEB_BUILD_GNU_TYPE) \
+		LDFLAGS="-Wl,--as-needed -Wl,-z,defs" --disable-i386-asm
+	# see https://bugs.launchpad.net/ubuntu/+source/prboom/+bug/375498 for an
+	# explanation for --disable-i386-asm
 
 	touch configure-stamp
 

-- 
clone of the legendary first person shooter Doom