Skip to content

Commit 7fcb335

Browse files
committed
bump(main/nodejs): v20.2.0
cacache patch has been removed as it is no longer needed npm/cacache#195
1 parent 1eeb9a6 commit 7fcb335

5 files changed

+45
-81
lines changed

packages/nodejs/build.sh

+6-2
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=19.9.0
5+
TERMUX_PKG_VERSION=20.2.0
66
TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
7-
TERMUX_PKG_SHA256=c7fce9d46ca6ce0d8990433cbf601bb9279c0eaed8705b357018cf50be9bed29
7+
TERMUX_PKG_SHA256=22523df2316c35569714ff1f69b053c2e286ced460898417dee46945efcdf989
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.
@@ -85,6 +85,10 @@ termux_step_configure() {
8585
$TERMUX_PKG_SRCDIR/out/tools/v8_gypfiles/gen-regexp-special-case.host.mk
8686
}
8787

88+
termux_step_make_install() {
89+
python ./tools/install.py install '' $TERMUX_PREFIX
90+
}
91+
8892
termux_step_create_debscripts() {
8993
cat <<- EOF > ./postinst
9094
#!$TERMUX_PREFIX/bin/sh

packages/nodejs/deps-npm-node_modules-cacache-lib-util-move-file.js.patch

-60
This file was deleted.

packages/nodejs/deps-uv-uv.gyp.patch

-8
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
'conditions': [
1919
['OS == "linux"', {
2020
'defines': [ '_POSIX_C_SOURCE=200112' ],
21-
@@ -249,6 +249,7 @@
22-
'src/unix/procfs-exepath.c',
23-
'src/unix/random-getrandom.c',
24-
'src/unix/random-sysctl-linux.c',
25-
+ 'src/unix/epoll.c',
26-
],
27-
'link_settings': {
28-
'libraries': [ '-ldl', '-lrt' ],
2921
@@ -267,6 +267,7 @@
3022
'src/unix/random-sysctl-linux.c',
3123
'src/unix/epoll.c',
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./deps/v8/src/trap-handler/trap-handler.h.orig 2022-11-23 18:22:22.422329609 +0530
2-
+++ ./deps/v8/src/trap-handler/trap-handler.h 2022-11-23 18:28:14.112329475 +0530
3-
@@ -17,23 +17,7 @@
1+
--- ./deps/v8/src/trap-handler/trap-handler.h.orig 2023-05-27 19:03:25.691202764 +0530
2+
+++ ./deps/v8/src/trap-handler/trap-handler.h 2023-05-27 19:05:56.783177361 +0530
3+
@@ -17,29 +17,7 @@
44
namespace internal {
55
namespace trap_handler {
66

@@ -13,14 +13,20 @@
1313
-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_DARWIN
1414
-#define V8_TRAP_HANDLER_SUPPORTED true
1515
-// Arm64 simulator on x64 on Linux, Mac, or Windows.
16+
-//
17+
-// The simulator case uses some inline assembly code, which cannot be
18+
-// compiled with MSVC, so don't enable the trap handler in that case.
19+
-// (MSVC #defines _MSC_VER, but so does Clang when targeting Windows, hence
20+
-// the check for __clang__.)
1621
-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && \
17-
- (V8_OS_LINUX || V8_OS_DARWIN || V8_OS_WIN)
22+
- (V8_OS_LINUX || V8_OS_DARWIN || V8_OS_WIN) && \
23+
- (!defined(_MSC_VER) || defined(__clang__))
1824
-#define V8_TRAP_HANDLER_VIA_SIMULATOR
1925
-#define V8_TRAP_HANDLER_SUPPORTED true
2026
-// Everything else is unsupported.
2127
-#else
2228
#define V8_TRAP_HANDLER_SUPPORTED false
2329
-#endif
2430

25-
// Setup for shared library export.
26-
#if defined(BUILDING_V8_SHARED) && defined(V8_OS_WIN)
31+
#if V8_OS_ANDROID && V8_TRAP_HANDLER_SUPPORTED
32+
// It would require some careful security review before the trap handler

packages/nodejs/node.gyp.patch

+27-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./node.gyp.orig 2023-04-11 01:28:53.000000000 +0530
2-
+++ ./node.gyp 2023-04-20 18:05:13.232655507 +0530
3-
@@ -156,7 +156,8 @@
1+
--- ./node.gyp.orig 2023-05-16 12:28:21.000000000 +0530
2+
+++ ./node.gyp 2023-05-27 19:10:17.150845679 +0530
3+
@@ -466,7 +466,8 @@
44
],
55

66
'sources': [
@@ -10,15 +10,15 @@
1010
],
1111

1212
'dependencies': [
13-
@@ -451,6 +452,7 @@
13+
@@ -761,6 +762,7 @@
1414
'include_dirs': [
1515
'src',
1616
'deps/postject',
1717
+ 'deps/cares/src/lib',
1818
'<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
1919
],
2020
'dependencies': [
21-
@@ -905,272 +907,6 @@
21+
@@ -947,294 +949,6 @@
2222
},
2323
],
2424
}, # node_lib_target_name
@@ -59,6 +59,10 @@
5959
- [ 'OS!="linux" or ossfuzz!="true"', {
6060
- 'type': 'none',
6161
- }],
62+
- # Avoid excessive LTO
63+
- ['enable_lto=="true"', {
64+
- 'ldflags': [ '-fno-lto' ],
65+
- }],
6266
- ],
6367
- }, # fuzz_env
6468
- {
@@ -125,6 +129,8 @@
125129
- 'sources': [
126130
- 'test/cctest/test_crypto_clienthello.cc',
127131
- 'test/cctest/test_node_crypto.cc',
132+
- 'test/cctest/test_quic_cid.cc',
133+
- 'test/cctest/test_quic_tokens.cc',
128134
- ]
129135
- }],
130136
- ['v8_enable_inspector==1', {
@@ -159,6 +165,10 @@
159165
- 'Ws2_32.lib',
160166
- ],
161167
- }],
168+
- # Avoid excessive LTO
169+
- ['enable_lto=="true"', {
170+
- 'ldflags': [ '-fno-lto' ],
171+
- }],
162172
- ],
163173
- }, # cctest
164174
-
@@ -212,6 +222,10 @@
212222
- 'Ws2_32.lib',
213223
- ],
214224
- }],
225+
- # Avoid excessive LTO
226+
- ['enable_lto=="true"', {
227+
- 'ldflags': [ '-fno-lto' ],
228+
- }],
215229
- ],
216230
- }, # embedtest
217231
-
@@ -230,6 +244,10 @@
230244
- 'test/overlapped-checker/main_unix.c'
231245
- ],
232246
- }],
247+
- # Avoid excessive LTO
248+
- ['enable_lto=="true"', {
249+
- 'ldflags': [ '-fno-lto' ],
250+
- }],
233251
- ]
234252
- }, # overlapped-checker
235253
- {
@@ -286,6 +304,10 @@
286304
- 'Ws2_32.lib',
287305
- ],
288306
- }],
307+
- # Avoid excessive LTO
308+
- ['enable_lto=="true"', {
309+
- 'ldflags': [ '-fno-lto' ],
310+
- }],
289311
- ],
290312
- }, # node_mksnapshot
291313
], # end targets

0 commit comments

Comments
 (0)