-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix,enhance,bump(main/luvi): bump to fixed version 2.15.0 (#22341)
Bump to fixed version, use shared lpeg, enables zlib, and fix luajit version symbol.
- Loading branch information
1 parent
91a75fa
commit 6e006df
Showing
3 changed files
with
62 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/src/main.c b/src/main.c | ||
index 3329716..84f73c0 100644 | ||
--- a/src/main.c | ||
+++ b/src/main.c | ||
@@ -62,7 +62,6 @@ static lua_State* vm_acquire(){ | ||
#endif | ||
#else | ||
#ifndef LUAJIT_MISSING_VERSION_SYM // debian patches luajit to remove this symbol, so we can't check it. | ||
- LUAJIT_VERSION_SYM(); | ||
#endif | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
diff --git a/deps/lpeg.cmake b/deps/lpeg.cmake | ||
index a95a207..7361b37 100644 | ||
--- a/deps/lpeg.cmake | ||
+++ b/deps/lpeg.cmake | ||
@@ -1,13 +1,18 @@ | ||
set(LPEGLIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/lpeg" CACHE PATH "Path to lpeg") | ||
|
||
-add_library(lpeglib STATIC | ||
- ${LPEGLIB_DIR}/lpcap.c | ||
- ${LPEGLIB_DIR}/lpcode.c | ||
- ${LPEGLIB_DIR}/lpcset.c | ||
- ${LPEGLIB_DIR}/lpprint.c | ||
- ${LPEGLIB_DIR}/lptree.c | ||
- ${LPEGLIB_DIR}/lpvm.c | ||
-) | ||
+if (WithSharedLPEG) | ||
+ list(APPEND LUVI_LIBRARIES ${LPEG_LIBRARIES}) | ||
+else () | ||
+ add_library(lpeglib STATIC | ||
+ ${LPEGLIB_DIR}/lpcap.c | ||
+ ${LPEGLIB_DIR}/lpcode.c | ||
+ ${LPEGLIB_DIR}/lpcset.c | ||
+ ${LPEGLIB_DIR}/lpprint.c | ||
+ ${LPEGLIB_DIR}/lptree.c | ||
+ ${LPEGLIB_DIR}/lpvm.c | ||
+ ) | ||
+ | ||
+ list(APPEND LUVI_LIBRARIES lpeglib) | ||
+endif () | ||
|
||
-list(APPEND LUVI_LIBRARIES lpeglib) | ||
list(APPEND LUVI_DEFINITIONS WITH_LPEG=1) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,45 @@ | ||
TERMUX_PKG_HOMEPAGE=https://luvit.io | ||
TERMUX_PKG_DESCRIPTION="A project in-between luv and luvit." | ||
TERMUX_PKG_DESCRIPTION="A project in-between luv and luvit" | ||
TERMUX_PKG_LICENSE="Apache-2.0" | ||
TERMUX_PKG_MAINTAINER="Komo @mbekkomo" | ||
TERMUX_PKG_VERSION=20241009 | ||
_commit=32b274bed2a291068eda6cf7a296328b86d682a9 | ||
_version=2.14.0+g${_commit::7} | ||
TERMUX_PKG_GIT_BRANCH=master | ||
TERMUX_PKG_SRCURL=git+https://github.com/luvit/luvi.git | ||
TERMUX_PKG_DEPENDS="pcre2, openssl, luv, libluajit" | ||
TERMUX_PKG_VERSION=2.15.0 | ||
TERMUX_PKG_SRCURL=git+https://github.com/luvit/luvi | ||
TERMUX_PKG_DEPENDS="libluajit, lua51-lpeg, luv, openssl, pcre2, zlib" | ||
TERMUX_PKG_SUGGESTS="lit, luvit" | ||
TERMUX_PKG_BUILD_IN_SRC=true | ||
TERMUX_PKG_AUTO_UPDATE=true | ||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" | ||
-DWithSharedLibluv=On | ||
-DWithOpenSSL=On | ||
-DWithSharedOpenSSL=On | ||
-DWithPCRE2=On | ||
-DWithSharedPCRE2=On | ||
-DWithLPEG=On | ||
-DWithSharedLPEG=On | ||
-DWithZLIB=On | ||
-DWithSharedZLIB=ON | ||
-DLIBLUV_INCLUDE_DIR=${TERMUX_PREFIX}/include/luv | ||
-DLIBLUV_LIBRARIES=${TERMUX_PREFIX}/lib/libluv.so | ||
-DLUAJIT_INCLUDE_DIR=${TERMUX_PREFIX}/include/luajit-2.1 | ||
-DLUAJIT_LIBRARIES=${TERMUX_PREFIX}/lib/libluajit.so | ||
-DLIBUV_INCLUDE_DIR=${TERMUX_PREFIX}/include | ||
-DLIBUV_LIBRARIES=${TERMUX_PREFIX}/lib/libuv.so | ||
-DOPENSSL_INCLUDE_DIR=${TERMUX_PREFIX}/include | ||
-DOPENSSL_LIBRARIES=${TERMUX_PREFIX}/lib | ||
-DPCRE2_INCLUDE_DIR=${TERMUX_PREFIX}/include | ||
-DPCRE2_LIBRARIES=${TERMUX_PREFIX}/lib | ||
-DZLIB_INCLUDE_DIR=${TERMUX_PREFIX}/include | ||
-DLIBLUV_LIBRARIES=${TERMUX_PREFIX}/lib/libluv.so | ||
-DLUAJIT_LIBRARIES=${TERMUX_PREFIX}/lib/libluajit.so | ||
-DLIBUV_LIBRARIES=${TERMUX_PREFIX}/lib/libuv.so | ||
-DOPENSSL_LIBRARIES=${TERMUX_PREFIX}/lib/libssl.so;${TERMUX_PREFIX}/lib/libcrypto.so | ||
-DPCRE2_LIBRARIES=${TERMUX_PREFIX}/lib/libpcre2-8.so | ||
-DZLIB_LIBRARIES=${TERMUX_PREFIX}/lib/libz.so | ||
-DLPEG_LIBRARIES=${TERMUX_PREFIX}/lib/liblpeg-5.1.so | ||
" | ||
|
||
termux_step_post_get_source() { | ||
git fetch --unshallow | ||
git checkout "${_commit}" | ||
} | ||
|
||
termux_step_pre_configure() { | ||
local dlp_commit="7adf5b3" script_checksum="4b4412c4e93c3cebfc830c643a04b31108a12f10abf7489ab0a80077a1a1ccdb" | ||
|
||
termux_download "https://github.com/ReFreezed/DumbLuaParser/raw/${dlp_commit}/dumbParser.lua" \ | ||
"${TERMUX_PKG_CACHEDIR}/dumbParser.lua" \ | ||
"${script_checksum}" | ||
export LUA_PATH=";;${TERMUX_PKG_CACHEDIR}/?.lua" | ||
echo "$_version" >"${TERMUX_PKG_SRCDIR}/VERSION" | ||
|
||
echo "${TERMUX_PKG_VERSION}" > "${TERMUX_PKG_SRCDIR}/VERSION" | ||
} |