Skip to content

Commit

Permalink
bump(main/nodejs): v20.2.0
Browse files Browse the repository at this point in the history
cacache patch has been removed as it is no longer needed npm/cacache#195
  • Loading branch information
WTNLXTBL committed Jun 8, 2023
1 parent 88d370c commit 2aa402b
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 81 deletions.
8 changes: 6 additions & 2 deletions packages/nodejs/build.sh
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/
TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environment"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Yaksh Bariya <thunder-coding@termux.dev>"
TERMUX_PKG_VERSION=19.9.0
TERMUX_PKG_VERSION=20.2.0
TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=c7fce9d46ca6ce0d8990433cbf601bb9279c0eaed8705b357018cf50be9bed29
TERMUX_PKG_SHA256=22523df2316c35569714ff1f69b053c2e286ced460898417dee46945efcdf989
# Note that we do not use a shared libuv to avoid an issue with the Android
# linker, which does not use symbols of linked shared libraries when resolving
# symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
Expand Down Expand Up @@ -85,6 +85,10 @@ termux_step_configure() {
$TERMUX_PKG_SRCDIR/out/tools/v8_gypfiles/gen-regexp-special-case.host.mk
}

termux_step_make_install() {
python ./tools/install.py install '' $TERMUX_PREFIX
}

termux_step_create_debscripts() {
cat <<- EOF > ./postinst
#!$TERMUX_PREFIX/bin/sh
Expand Down

This file was deleted.

8 changes: 0 additions & 8 deletions packages/nodejs/deps-uv-uv.gyp.patch
Expand Up @@ -18,14 +18,6 @@
'conditions': [
['OS == "linux"', {
'defines': [ '_POSIX_C_SOURCE=200112' ],
@@ -249,6 +249,7 @@
'src/unix/procfs-exepath.c',
'src/unix/random-getrandom.c',
'src/unix/random-sysctl-linux.c',
+ 'src/unix/epoll.c',
],
'link_settings': {
'libraries': [ '-ldl', '-lrt' ],
@@ -267,6 +267,7 @@
'src/unix/random-sysctl-linux.c',
'src/unix/epoll.c',
Expand Down
18 changes: 12 additions & 6 deletions packages/nodejs/deps-v8-src-trap-handler-trap-handler.h.patch
@@ -1,6 +1,6 @@
--- ./deps/v8/src/trap-handler/trap-handler.h.orig 2022-11-23 18:22:22.422329609 +0530
+++ ./deps/v8/src/trap-handler/trap-handler.h 2022-11-23 18:28:14.112329475 +0530
@@ -17,23 +17,7 @@
--- ./deps/v8/src/trap-handler/trap-handler.h.orig 2023-05-27 19:03:25.691202764 +0530
+++ ./deps/v8/src/trap-handler/trap-handler.h 2023-05-27 19:05:56.783177361 +0530
@@ -17,29 +17,7 @@
namespace internal {
namespace trap_handler {

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

// Setup for shared library export.
#if defined(BUILDING_V8_SHARED) && defined(V8_OS_WIN)
#if V8_OS_ANDROID && V8_TRAP_HANDLER_SUPPORTED
// It would require some careful security review before the trap handler
32 changes: 27 additions & 5 deletions packages/nodejs/node.gyp.patch
@@ -1,6 +1,6 @@
--- ./node.gyp.orig 2023-04-11 01:28:53.000000000 +0530
+++ ./node.gyp 2023-04-20 18:05:13.232655507 +0530
@@ -156,7 +156,8 @@
--- ./node.gyp.orig 2023-05-16 12:28:21.000000000 +0530
+++ ./node.gyp 2023-05-27 19:10:17.150845679 +0530
@@ -466,7 +466,8 @@
],

'sources': [
Expand All @@ -10,15 +10,15 @@
],

'dependencies': [
@@ -451,6 +452,7 @@
@@ -761,6 +762,7 @@
'include_dirs': [
'src',
'deps/postject',
+ 'deps/cares/src/lib',
'<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
],
'dependencies': [
@@ -905,272 +907,6 @@
@@ -947,294 +949,6 @@
},
],
}, # node_lib_target_name
Expand Down Expand Up @@ -59,6 +59,10 @@
- [ 'OS!="linux" or ossfuzz!="true"', {
- 'type': 'none',
- }],
- # Avoid excessive LTO
- ['enable_lto=="true"', {
- 'ldflags': [ '-fno-lto' ],
- }],
- ],
- }, # fuzz_env
- {
Expand Down Expand Up @@ -125,6 +129,8 @@
- 'sources': [
- 'test/cctest/test_crypto_clienthello.cc',
- 'test/cctest/test_node_crypto.cc',
- 'test/cctest/test_quic_cid.cc',
- 'test/cctest/test_quic_tokens.cc',
- ]
- }],
- ['v8_enable_inspector==1', {
Expand Down Expand Up @@ -159,6 +165,10 @@
- 'Ws2_32.lib',
- ],
- }],
- # Avoid excessive LTO
- ['enable_lto=="true"', {
- 'ldflags': [ '-fno-lto' ],
- }],
- ],
- }, # cctest
-
Expand Down Expand Up @@ -212,6 +222,10 @@
- 'Ws2_32.lib',
- ],
- }],
- # Avoid excessive LTO
- ['enable_lto=="true"', {
- 'ldflags': [ '-fno-lto' ],
- }],
- ],
- }, # embedtest
-
Expand All @@ -230,6 +244,10 @@
- 'test/overlapped-checker/main_unix.c'
- ],
- }],
- # Avoid excessive LTO
- ['enable_lto=="true"', {
- 'ldflags': [ '-fno-lto' ],
- }],
- ]
- }, # overlapped-checker
- {
Expand Down Expand Up @@ -286,6 +304,10 @@
- 'Ws2_32.lib',
- ],
- }],
- # Avoid excessive LTO
- ['enable_lto=="true"', {
- 'ldflags': [ '-fno-lto' ],
- }],
- ],
- }, # node_mksnapshot
], # end targets
Expand Down

0 comments on commit 2aa402b

Please sign in to comment.