From 90cfdb8e4a512887f63a7fa06c3f8dd0bb342c0e Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 12 Aug 2015 15:49:21 -0400 Subject: [PATCH] luajit: Add $PREFIX/share/luajit-2.0.4/jit/ folder This makes the 'luajit -b' functionality work. Closes #5. --- packages/libluajit/build.sh | 9 +++++++++ packages/libluajit/luajit.subpackage.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/libluajit/build.sh b/packages/libluajit/build.sh index be3ed4aa..942ea3cc 100644 --- a/packages/libluajit/build.sh +++ b/packages/libluajit/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://luajit.org/ TERMUX_PKG_DESCRIPTION="Just-In-Time Compiler for Lua" TERMUX_PKG_VERSION=2.0.4 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://luajit.org/download/LuaJIT-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_MAKE_ARGS="amalg PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=yes @@ -37,5 +38,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 } diff --git a/packages/libluajit/luajit.subpackage.sh b/packages/libluajit/luajit.subpackage.sh index 66b54c5e..53020228 100644 --- a/packages/libluajit/luajit.subpackage.sh +++ b/packages/libluajit/luajit.subpackage.sh @@ -1,3 +1,3 @@ -TERMUX_SUBPKG_INCLUDE="bin/luajit share/man/man1" +TERMUX_SUBPKG_INCLUDE="bin/luajit share/man/man1 $TERMUX_LUAJIT_JIT_FOLDER_RELATIVE" TERMUX_SUBPKG_DESCRIPTION="Just-In-Time compiler for Lua - command line tool" TERMUX_SUBPKG_DEPENDS="libluajit" -- 2.11.0