txikijs: Bump to 22.11.1
This commit is contained in:
parent
69edf58a17
commit
aad169032c
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -128,7 +128,6 @@
|
||||||
|
target_include_directories(tjs PRIVATE ${TMP_INSTALL_DIR}/usr/local/include)
|
||||||
|
target_link_libraries(tjs libffi_a)
|
||||||
|
else()
|
||||||
|
- find_library(FFI_LIB NAMES libffi ffi)
|
||||||
|
find_path(FFI_INCLUDE_DIR NAMES ffi.h)
|
||||||
|
target_include_directories(tjs PRIVATE ${FFI_INCLUDE_DIR})
|
||||||
|
target_link_libraries(tjs ${FFI_LIB})
|
|
@ -1,11 +1,11 @@
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -101,7 +101,7 @@
|
@@ -92,7 +92,7 @@
|
||||||
src/worker.c
|
src/worker.c
|
||||||
|
src/ws.c
|
||||||
src/xhr.c
|
src/xhr.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/js.c
|
|
||||||
- ../deps/quickjs/src/cutils.c
|
- ../deps/quickjs/src/cutils.c
|
||||||
+ deps/quickjs/src/cutils.c
|
+ deps/quickjs/src/cutils.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(tjs PROPERTIES
|
if(NOT MINGW)
|
||||||
|
|
|
@ -2,13 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://github.com/saghul/txiki.js
|
||||||
TERMUX_PKG_DESCRIPTION="A small and powerful JavaScript runtime"
|
TERMUX_PKG_DESCRIPTION="A small and powerful JavaScript runtime"
|
||||||
TERMUX_PKG_LICENSE="MIT"
|
TERMUX_PKG_LICENSE="MIT"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
_COMMIT=ffa4b191eeb23984d502b183a1f521be717f1eb5
|
TERMUX_PKG_VERSION=1:22.11.1
|
||||||
TERMUX_PKG_VERSION=2021.11.16
|
|
||||||
TERMUX_PKG_SRCURL=https://github.com/saghul/txiki.js.git
|
TERMUX_PKG_SRCURL=https://github.com/saghul/txiki.js.git
|
||||||
TERMUX_PKG_GIT_BRANCH=master
|
TERMUX_PKG_GIT_BRANCH=v${TERMUX_PKG_VERSION#*:}
|
||||||
TERMUX_PKG_DEPENDS="libcurl"
|
TERMUX_PKG_DEPENDS="libcurl, libffi"
|
||||||
TERMUX_PKG_BUILD_IN_SRC=true
|
TERMUX_PKG_BUILD_IN_SRC=true
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_NATIVE=OFF"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
|
-DBUILD_NATIVE=OFF
|
||||||
|
-DUSE_EXTERNAL_FFI=ON
|
||||||
|
-DFFI_INCLUDE_DIR=$TERMUX_PREFIX/include
|
||||||
|
-DFFI_LIB=$TERMUX_PREFIX/lib/libffi.so
|
||||||
|
"
|
||||||
TERMUX_PKG_HOSTBUILD=true
|
TERMUX_PKG_HOSTBUILD=true
|
||||||
|
|
||||||
# Build failure for i686:
|
# Build failure for i686:
|
||||||
|
@ -19,18 +23,6 @@ TERMUX_PKG_HOSTBUILD=true
|
||||||
# ^ ~~~~~~~~~~~~~~~~~~~~~~
|
# ^ ~~~~~~~~~~~~~~~~~~~~~~
|
||||||
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
|
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
|
||||||
|
|
||||||
termux_step_post_get_source() {
|
|
||||||
git fetch --unshallow
|
|
||||||
git checkout $_COMMIT
|
|
||||||
|
|
||||||
local version="$(git log -1 --format=%cs | sed 's/-/./g')"
|
|
||||||
if [ "$version" != "$TERMUX_PKG_VERSION" ]; then
|
|
||||||
echo -n "ERROR: The specified version \"$TERMUX_PKG_VERSION\""
|
|
||||||
echo " is different from what is expected to be: \"$version\""
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
termux_step_host_build() {
|
termux_step_host_build() {
|
||||||
find $TERMUX_PKG_SRCDIR -mindepth 1 -maxdepth 1 ! -name '.git*' \
|
find $TERMUX_PKG_SRCDIR -mindepth 1 -maxdepth 1 ! -name '.git*' \
|
||||||
-exec cp -a \{\} ./ \;
|
-exec cp -a \{\} ./ \;
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/src/js/CMakeLists.txt
|
|
||||||
+++ b/src/js/CMakeLists.txt
|
|
||||||
@@ -24,7 +24,7 @@
|
|
||||||
${JS_PATH}/worker-bootstrap.js
|
|
||||||
)
|
|
||||||
|
|
||||||
-set(CUSTOM_QJSC "${CMAKE_CURRENT_BINARY_DIR}/qjsc" CACHE STRING "Custom path to QJSC")
|
|
||||||
+set(CUSTOM_QJSC "qjsc" CACHE STRING "Custom path to QJSC")
|
|
||||||
add_custom_command(
|
|
||||||
COMMAND
|
|
||||||
${CUSTOM_QJSC}
|
|
Loading…
Reference in New Issue