diff --git a/packages/luv/CMakeLists.txt.patch b/packages/luv/CMakeLists.txt.patch deleted file mode 100644 index 6956d83d9..000000000 --- a/packages/luv/CMakeLists.txt.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr luv-1.36.0-0/CMakeLists.txt luv-1.36.0-0.mod/CMakeLists.txt ---- luv-1.36.0-0/CMakeLists.txt 2020-04-19 08:44:19.000000000 +0000 -+++ luv-1.36.0-0.mod/CMakeLists.txt 2021-02-05 22:07:47.397165825 +0000 -@@ -108,7 +108,6 @@ - find_package(LuaJIT REQUIRED) - link_directories(${LUAJIT_LIBRARIES}) - else() -- find_package(LuaJIT) - endif() - if(NOT LUAJIT_INCLUDE_DIR) - message( FATAL_ERROR "Failed to find LuaJIT headers. Variable `LUAJIT_INCLUDE_DIR' expected to be defined.") -@@ -187,7 +186,7 @@ - elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - target_link_libraries(${TARGET_NAME} ${LIBUV_LIBRARIES} rt) - else() -- target_link_libraries(${TARGET_NAME} ${LIBUV_LIBRARIES}) -+ target_link_libraries(${TARGET_NAME} ${LIBUV_LIBRARIES} lua5.3) - endif() - endforeach() - diff --git a/packages/luv/build.sh b/packages/luv/build.sh index 6708ddf36..48af8401a 100644 --- a/packages/luv/build.sh +++ b/packages/luv/build.sh @@ -3,19 +3,20 @@ TERMUX_PKG_DESCRIPTION="Bare libuv bindings for lua" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.41.0-0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/luvit/luv/releases/download/$TERMUX_PKG_VERSION/luv-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321 -TERMUX_PKG_DEPENDS="liblua53, libuv" +TERMUX_PKG_DEPENDS="libluajit, libuv" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON -DLUA_BUILD_TYPE=System --DLUA_INCLUDE_DIR=$TERMUX_PREFIX/include/lua5.3 --DLUA_PACKAGE_DIR=$TERMUX_PREFIX/lib/lua/5.3 --DWITH_LUA_ENGINE=Lua +-DLUAJIT_INCLUDE_DIR=$TERMUX_PREFIX/include/luajit-2.1 +-DLUA_PACKAGE_DIR=$TERMUX_PREFIX/lib/lua/5.1 +-DWITH_LUA_ENGINE=LuaJit -DWITH_SHARED_LIBUV=ON " termux_step_pre_configure() { - export LDFLAGS+=" -L$TERMUX_PREFIX/lib/lua/5.3" + export LDFLAGS+=" -L$TERMUX_PREFIX/lib/lua/5.1" }