luajit: Add $PREFIX/share/luajit-2.0.4/jit/ folder

This makes the 'luajit -b' functionality work. Closes #5.

diff --git a/packages/libluajit/build.sh b/packages/libluajit/build.sh
index be3ed4aa299cba7c4f0a70aea9aaf7ebf95860aa..942ea3ccb2ddc6f5afb586272e30bd02948a9825 100644 (file)
--- 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_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
 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/
 
         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
 }
         STRIP=$ORIG_STRIP
 }

diff --git a/packages/libluajit/luajit.subpackage.sh b/packages/libluajit/luajit.subpackage.sh
index 66b54c5e34ad1b2612f9b689c400498971a22202..5302022838fcb6b1c18fdbdf63880b56f32b05aa 100644 (file)
--- 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"
 TERMUX_SUBPKG_DESCRIPTION="Just-In-Time compiler for Lua - command line tool"
 TERMUX_SUBPKG_DEPENDS="libluajit"