From 737f9ff3ced01c26db3509ada159035a3eae7c2f Mon Sep 17 00:00:00 2001 From: shadmansaleh Date: Mon, 5 Jul 2021 23:24:56 +0600 Subject: [PATCH] Fix libluajit having wrong version name for include/ --- packages/libluajit/build.sh | 11 +++++++---- packages/neovim/build.sh | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/libluajit/build.sh b/packages/libluajit/build.sh index 29ca7c071..97776d08f 100644 --- a/packages/libluajit/build.sh +++ b/packages/libluajit/build.sh @@ -32,12 +32,15 @@ termux_step_pre_configure() { } termux_step_make_install () { - mkdir -p $TERMUX_PREFIX/include/luajit-${TERMUX_PKG_VERSION:0:3}/ - cp -f $TERMUX_PKG_SRCDIR/src/{lauxlib.h,lua.h,lua.hpp,luaconf.h,luajit.h,lualib.h} $TERMUX_PREFIX/include/luajit-${TERMUX_PKG_VERSION:0:3}/ + mkdir -p $TERMUX_PREFIX/include/luajit-${TERMUX_PKG_VERSION:2:3}/ + cp -f $TERMUX_PKG_SRCDIR/src/{lauxlib.h,lua.h,lua.hpp,luaconf.h,luajit.h,lualib.h} $TERMUX_PREFIX/include/luajit-${TERMUX_PKG_VERSION:2:3}/ rm -f $TERMUX_PREFIX/lib/libluajit* - install -Dm600 $TERMUX_PKG_SRCDIR/src/libluajit.so $TERMUX_PREFIX/lib/libluajit-5.1.so - (cd $TERMUX_PREFIX/lib; ln -s -f libluajit-5.1.so libluajit.so) + install -Dm600 $TERMUX_PKG_SRCDIR/src/libluajit.so $TERMUX_PREFIX/lib/libluajit-5.1.so.2.1.0 + (cd $TERMUX_PREFIX/lib; + ln -s -f libluajit-5.1.so.2.1.0 libluajit.so; + ln -s -f libluajit-5.1.so.2.1.0 libluajit-5.1.so; + ln -s -f libluajit-5.1.so.2.1.0 libluajit-5.1.so.2;) install -Dm600 $TERMUX_PKG_SRCDIR/etc/luajit.1 $TERMUX_PREFIX/share/man/man1/luajit.1 install -Dm600 $TERMUX_PKG_SRCDIR/etc/luajit.pc $TERMUX_PREFIX/lib/pkgconfig/luajit.pc diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index de1cb8190..e789c7660 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -16,7 +16,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit -DPKG_CONFIG_EXECUTABLE=$(which pkg-config) -DXGETTEXT_PRG=$(which xgettext) --DLUAJIT_INCLUDE_DIR=$TERMUX_PREFIX/include/luajit-1:2 +-DLUAJIT_INCLUDE_DIR=$TERMUX_PREFIX/include/luajit-2.1 " TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"