diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 12e44c58e9..94a507ab63 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environme TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=14.18.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=6b485158a0ae4e936346b45da6fdd2ee96cecfef82fce86f281e6bfa14d85859 # Note that we do not use a shared libuv to avoid an issue with the Android @@ -16,18 +17,6 @@ TERMUX_PKG_SUGGESTS="clang, make, pkg-config, python" TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true -# Build fails on x86_64 with: -# g++ -rdynamic -m64 -pthread -m64 -fPIC -o /home/builder/.termux-build/nodejs/src/out/Release/mksnapshot ... -# /usr/bin/ld: /home/builder/.termux-build/nodejs/src/out/Release/obj.host/v8_base_without_compiler/deps/v8/src/api/api.o: -# in function `v8::TryHandleWebAssemblyTrapPosix(int, siginfo_t*, void*)': -# api.cc:(.text._ZN2v829TryHandleWebAssemblyTrapPosixEiP9siginfo_tPv+0x5): -# undefined reference to `v8::internal::trap_handler::TryHandleSignal(int, siginfo_t*, void*)' -# /usr/bin/ld: /home/builder/.termux-build/nodejs/src/out/Release/obj.host/v8_base_without_compiler/deps/v8/src/trap-handler/handler-outside.o: -# in function `v8::internal::trap_handler::EnableTrapHandler(bool)': -# handler-outside.cc:(.text._ZN2v88internal12trap_handler17EnableTrapHandlerEb+0x25): -# undefined reference to `v8::internal::trap_handler::RegisterDefaultTrapHandler()' -# collect2: error: ld returned 1 exit status -TERMUX_PKG_BLACKLISTED_ARCHES="x86_64" termux_step_post_get_source() { # Prevent caching of host build: diff --git a/packages/nodejs-lts/deps-v8-src-api-api.cc.patch b/packages/nodejs-lts/deps-v8-src-api-api.cc.patch new file mode 100644 index 0000000000..41b4ef436b --- /dev/null +++ b/packages/nodejs-lts/deps-v8-src-api-api.cc.patch @@ -0,0 +1,14 @@ +--- ./deps/v8/src/api/api.cc 2021-10-10 08:40:26.362257694 +0530 ++++ ./deps/v8/src/api/api.cc.mod 2021-10-10 08:41:20.172257674 +0530 +@@ -5645,11 +5645,7 @@ + #if V8_OS_LINUX || V8_OS_MACOSX + bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, + void* context) { +-#if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID +- return i::trap_handler::TryHandleSignal(sig_code, info, context); +-#else + return false; +-#endif + } + + bool V8::TryHandleSignal(int signum, void* info, void* context) { diff --git a/packages/nodejs-lts/deps-v8-src-trap-handler-trap-handler.h.patch b/packages/nodejs-lts/deps-v8-src-trap-handler-trap-handler.h.patch new file mode 100644 index 0000000000..7473fdff58 --- /dev/null +++ b/packages/nodejs-lts/deps-v8-src-trap-handler-trap-handler.h.patch @@ -0,0 +1,21 @@ +--- ./deps/v8/src/trap-handler/trap-handler.h 2021-10-09 22:03:46.598999406 +0530 ++++ ./deps/v8/src/trap-handler/trap-handler.h.mod 2021-10-09 22:04:19.448999394 +0530 +@@ -16,18 +16,7 @@ + namespace internal { + namespace trap_handler { + +-// TODO(eholk): Support trap handlers on other platforms. +-#if V8_TARGET_ARCH_X64 && V8_OS_LINUX && !V8_OS_ANDROID +-#define V8_TRAP_HANDLER_SUPPORTED true +-#elif V8_TARGET_ARCH_X64 && V8_OS_WIN +-#define V8_TRAP_HANDLER_SUPPORTED true +-#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX +-#define V8_TRAP_HANDLER_SUPPORTED true +-#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD +-#define V8_TRAP_HANDLER_SUPPORTED true +-#else + #define V8_TRAP_HANDLER_SUPPORTED false +-#endif + + struct ProtectedInstructionData { + // The offset of this instruction from the start of its code object.