X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..382cfb780ca9a40f80e3932544bd32aeccb66e5a:/packages/libluajit/build.sh

diff --git a/packages/libluajit/build.sh b/packages/libluajit/build.sh
index be3ed4aa..8589617b 100644
--- a/packages/libluajit/build.sh
+++ b/packages/libluajit/build.sh
@@ -1,19 +1,22 @@
 TERMUX_PKG_HOMEPAGE=http://luajit.org/
 TERMUX_PKG_DESCRIPTION="Just-In-Time Compiler for Lua"
-TERMUX_PKG_VERSION=2.0.4
-TERMUX_PKG_SRCURL=http://luajit.org/download/LuaJIT-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION=2.1.0~beta2
+TERMUX_PKG_SRCURL=http://luajit.org/download/LuaJIT-2.1.0-beta2.tar.gz
 TERMUX_PKG_EXTRA_MAKE_ARGS="amalg PREFIX=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 # luajit wants same pointer size for host and target build
 export HOST_CC="gcc"
-if [ `uname` = "Linux" ]; then
-        # NOTE: "apt install libc6-dev-i386" for 32-bit headers
-        export HOST_CFLAGS="-m32" # -arch i386"
-        export HOST_LDFLAGS="-m32" # arch i386"
-elif [ `uname` = "Darwin" ]; then
-        export HOST_CFLAGS="-m32 -arch i386"
-        export HOST_LDFLAGS="-arch i386"
+if [ $TERMUX_ARCH_BITS = "32" ]; then
+	if [ `uname` = "Linux" ]; then
+		# NOTE: "apt install libc6-dev-i386" for 32-bit headers
+		export HOST_CFLAGS="-m32" # -arch i386"
+		export HOST_LDFLAGS="-m32" # arch i386"
+
+	elif [ `uname` = "Darwin" ]; then
+		export HOST_CFLAGS="-m32 -arch i386"
+		export HOST_LDFLAGS="-arch i386"
+	fi
 fi
 export CROSS=${TERMUX_HOST_PLATFORM}-
 export TARGET_FLAGS="$CFLAGS $CPPFLAGS $LDFLAGS"
@@ -37,5 +40,13 @@ termux_step_make_install () {
         rm -f $TERMUX_PREFIX/bin/luajit
         cp $TERMUX_PKG_SRCDIR/src/luajit $TERMUX_PREFIX/bin/
 
+	# Files needed for the -b option (http://luajit.org/running.html) to work.
+	# Note that they end up in the 'luajit' subpackage, not the 'libluajit' one.
+	TERMUX_LUAJIT_JIT_FOLDER_RELATIVE=share/luajit-$TERMUX_PKG_VERSION/jit
+	local TERMUX_LUAJIT_JIT_FOLDER=$TERMUX_PREFIX/$TERMUX_LUAJIT_JIT_FOLDER_RELATIVE
+	rm -Rf $TERMUX_LUAJIT_JIT_FOLDER
+	mkdir -p $TERMUX_LUAJIT_JIT_FOLDER
+	cp $TERMUX_PKG_SRCDIR/src/jit/*lua $TERMUX_LUAJIT_JIT_FOLDER
+
         STRIP=$ORIG_STRIP
 }