[Pkg-sdl-commits] [libsdl2-gfx] 01/01: Fixing some FTBFS due to wrong mmx detection

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Tue Jan 28 13:49:26 UTC 2014


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

locutusofborg-guest pushed a commit to branch master
in repository libsdl2-gfx.

commit da59d49181b0abf53897f95afc2cf0ed0b1b4d47
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jan 28 14:48:28 2014 +0100

    Fixing some FTBFS due to wrong mmx detection
---
 debian/rules | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 527e671..b123b1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,26 @@
 #!/usr/bin/make -f
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 %:
 	dh $@ --with autoreconf --parallel
 
+CONFIGURE_FLAGS ?=--disable-mmx
+
+ifeq ($(DEB_HOST_ARCH), i386 )
+	CONFIGURE_FLAGS =--enable-mmx
+endif
+ifeq ($(DEB_HOST_ARCH), amd64)
+	CONFIGURE_FLAGS =--enable-mmx
+endif
+
 override_dh_autoreconf:
 	AUTOMAKE="automake --foreign" dh_autoreconf --as-needed
 
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_FLAGS)
+
 override_dh_install:
 	dh_install --fail-missing -XlibSDL2_gfx.la
 
@@ -17,7 +30,7 @@ override_dh_auto_build:
 
 override_dh_link:
 	# fix lintian warning embedded-javascript-library
-	rm debian/libsdl2-gfx-doc/usr/share/doc/libsdl2-gfx-doc/jquery.js
+	rm -f debian/libsdl2-gfx-doc/usr/share/doc/libsdl2-gfx-doc/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.js debian/libsdl2-gfx-doc/usr/share/doc/libsdl2-gfx-doc/jquery.js
 	# fix lintian warning dev-pkg-without-shlib-symlink
 	dh_link -plibsdl2-gfx-dev usr/lib/$(DEB_HOST_MULTIARCH)/libSDL2_gfx-1.0.so.0.0.0 usr/lib/$(DEB_HOST_MULTIARCH)/libSDL2_gfx-1.0.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2-gfx.git



More information about the pkg-sdl-commits mailing list