r15048 - packages/trunk/love/debian

[Miriam Ruiz]

Author: miriam
Date: 2014-04-28 20:35:49 +0000 (Mon, 28 Apr 2014)
New Revision: 15048

Modified:
   packages/trunk/love/debian/changelog
   packages/trunk/love/debian/control
   packages/trunk/love/debian/rules
Log:
Don't use luajit for architectures where it is not supported



Modified: packages/trunk/love/debian/changelog
===================================================================
--- packages/trunk/love/debian/changelog	2014-04-27 10:17:00 UTC (rev 15047)
+++ packages/trunk/love/debian/changelog	2014-04-28 20:35:49 UTC (rev 15048)
@@ -1,3 +1,10 @@
+love (0.9.1-2) unstable; urgency=medium
+
+  * Don't use luajit for architectures where it is not supported:
+    hurd-i386 !kfreebsd-amd64 !s390x
+
+ -- Miriam Ruiz <miriam at debian.org>  Mon, 28 Apr 2014 22:34:08 +0200
+
 love (0.9.1-1) unstable; urgency=medium
 
   [ Miriam Ruiz ]

Modified: packages/trunk/love/debian/control
===================================================================
--- packages/trunk/love/debian/control	2014-04-27 10:17:00 UTC (rev 15047)
+++ packages/trunk/love/debian/control	2014-04-28 20:35:49 UTC (rev 15048)
@@ -8,7 +8,8 @@
  libopenal-dev, liblua5.1-0-dev, libphysfs-dev, libdevil-dev, libfreetype6-dev,
  libmng-dev, libmodplug-dev, libmpg123-dev, libflac-dev, libflac++-dev,
  libxpm-dev, libxcursor-dev, libxxf86vm-dev, libtiff-dev, libpng-dev,
- libluajit-5.1-dev, libvorbis-dev, libogg-dev, glee-dev, lua5.2 | lua5.1
+ libvorbis-dev, libogg-dev, glee-dev, lua5.2 | lua5.1, 
+ libluajit-5.1-dev [!hurd-i386 !kfreebsd-amd64 !s390x]
 Standards-Version: 3.9.5
 Homepage: http://love2d.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/love/

Modified: packages/trunk/love/debian/rules
===================================================================
--- packages/trunk/love/debian/rules	2014-04-27 10:17:00 UTC (rev 15047)
+++ packages/trunk/love/debian/rules	2014-04-28 20:35:49 UTC (rev 15048)
@@ -10,23 +10,29 @@
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-as-needed
 
-configure: configure-stamp
-configure-stamp: 
-	dh_testdir
-
-	libtoolize
-	dh_autoreconf
-
-	./configure $(CROSS) \
+CONFIGURE_OPTIONS:= \
+		$(CROSS) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--with-lua=luajit \
 		CPPFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
 		LDFLAGS="$(LDFLAGS)"
 
+configure: configure-stamp
+configure-stamp: 
+	dh_testdir
+
+	libtoolize
+	dh_autoreconf
+
+	if pkg-config luajit ; then echo + Using luagit ; \
+		./configure $(CONFIGURE_OPTIONS) --with-lua=luajit ; \
+	else echo + Using lua ; \
+		./configure $(CONFIGURE_OPTIONS) --with-lua=lua ; \
+	fi
+
 	cd src/scripts/ && lua auto.lua boot graphics
 	touch $@