Skip to content

Commit 154bd59

Browse files
nodejs: Bump to 16.11.0 (#7710)
Other changes done: - Removed `no-android-log.patch` since Node.js uses GYP and not GN to build itself. This patch must be having no effect at all - Added patch to force `V8_TRAP_HANDLER_SUPPORTED` to always false which fixes builds for x86_64 which started reproducing even on aarch64 - Removed `x86_64` as blacklisted arch
1 parent 119c124 commit 154bd59

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

packages/nodejs/build.sh

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/
22
TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environment"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="Yaksh Bariya <[email protected]>"
5-
TERMUX_PKG_VERSION=16.10.0
5+
TERMUX_PKG_VERSION=16.11.0
66
TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
7-
TERMUX_PKG_SHA256=97dc1aca232b4911e0b9e5a23a03200ab8ef05157e03c732315b579481bf7912
7+
TERMUX_PKG_SHA256=d3f631bd0d215ded26b49b2eae42c84de2ba1b46f00cc2930809900a0f7165ae
88
# Note that we do not use a shared libuv to avoid an issue with the Android
99
# linker, which does not use symbols of linked shared libraries when resolving
1010
# symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
@@ -16,18 +16,6 @@ TERMUX_PKG_SUGGESTS="clang, make, pkg-config, python"
1616
TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
1717
TERMUX_PKG_BUILD_IN_SRC=true
1818
TERMUX_PKG_HOSTBUILD=true
19-
# Build fails on x86_64 with:
20-
# g++ -rdynamic -m64 -pthread -m64 -fPIC -o /home/builder/.termux-build/nodejs/src/out/Release/mksnapshot ...
21-
# /usr/bin/ld: /home/builder/.termux-build/nodejs/src/out/Release/obj.host/v8_base_without_compiler/deps/v8/src/api/api.o:
22-
# in function `v8::TryHandleWebAssemblyTrapPosix(int, siginfo_t*, void*)':
23-
# api.cc:(.text._ZN2v829TryHandleWebAssemblyTrapPosixEiP9siginfo_tPv+0x5):
24-
# undefined reference to `v8::internal::trap_handler::TryHandleSignal(int, siginfo_t*, void*)'
25-
# /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:
26-
# in function `v8::internal::trap_handler::EnableTrapHandler(bool)':
27-
# handler-outside.cc:(.text._ZN2v88internal12trap_handler17EnableTrapHandlerEb+0x25):
28-
# undefined reference to `v8::internal::trap_handler::RegisterDefaultTrapHandler()'
29-
# collect2: error: ld returned 1 exit status
30-
TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
3119

3220
termux_step_post_get_source() {
3321
# Prevent caching of host build:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--- ./deps/v8/src/trap-handler/trap-handler.h 2021-10-08 19:08:46.000000000 +0530
2+
+++ ./deps/v8/src/trap-handler/trap-handler.h.mod 2021-10-09 19:43:08.715641214 +0530
3+
@@ -17,22 +17,7 @@
4+
namespace internal {
5+
namespace trap_handler {
6+
7+
-// X64 on Linux, Windows, MacOS, FreeBSD.
8+
-#if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 && \
9+
- ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_MACOSX || \
10+
- V8_OS_FREEBSD)
11+
-#define V8_TRAP_HANDLER_SUPPORTED true
12+
-// Arm64 (non-simulator) on Mac.
13+
-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX
14+
-#define V8_TRAP_HANDLER_SUPPORTED true
15+
-// Arm64 simulator on x64 on Linux or Mac.
16+
-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && (V8_OS_LINUX || V8_OS_MACOSX)
17+
-#define V8_TRAP_HANDLER_VIA_SIMULATOR
18+
-#define V8_TRAP_HANDLER_SUPPORTED true
19+
-// Everything else is unsupported.
20+
-#else
21+
#define V8_TRAP_HANDLER_SUPPORTED false
22+
-#endif
23+
24+
// Setup for shared library export.
25+
#if defined(BUILDING_V8_SHARED) && defined(V8_OS_WIN)

packages/nodejs/no-android-log.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)