From 2903d08bc2a991b2213a0a97d77597392dcd0caf Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 28 Sep 2021 19:26:28 +0530 Subject: [PATCH] nodejs-lts: Bump to 14.18.0 --- packages/nodejs-lts/build.sh | 7 +++-- .../deps-uv-src-unix-process.c.patch | 27 ++++++------------- packages/nodejs-lts/deps-uv-uv.gyp.patch | 17 ++++++++---- packages/nodejs-lts/node.gyp.patch | 14 +++++----- 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index a9a182a3c..12e44c58e 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -2,11 +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 " -# Note: package build may fail on Github Actions CI due to out-of-memory -# condition. It should be built locally instead. -TERMUX_PKG_VERSION=14.17.6 +TERMUX_PKG_VERSION=14.18.0 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=f458cd0b1cb1540611cb08709d833c0c59c74da79310ae1984cc8bad1404ad5e +TERMUX_PKG_SHA256=6b485158a0ae4e936346b45da6fdd2ee96cecfef82fce86f281e6bfa14d85859 # 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. @@ -65,6 +63,7 @@ termux_step_configure() { DEST_CPU="arm" elif [ $TERMUX_ARCH = "i686" ]; then DEST_CPU="ia32" + LDFLAGS+=" -u __atomic_fetch_add_8 -u __atomic_load_8 -u __atomic_compare_exchange_8 -latomic" elif [ $TERMUX_ARCH = "aarch64" ]; then DEST_CPU="arm64" elif [ $TERMUX_ARCH = "x86_64" ]; then diff --git a/packages/nodejs-lts/deps-uv-src-unix-process.c.patch b/packages/nodejs-lts/deps-uv-src-unix-process.c.patch index bed8b0b2c..33b1bca44 100644 --- a/packages/nodejs-lts/deps-uv-src-unix-process.c.patch +++ b/packages/nodejs-lts/deps-uv-src-unix-process.c.patch @@ -1,9 +1,8 @@ -diff -uNr node-v12.10.0/deps/uv/src/unix/process.c node-v12.10.0.mod/deps/uv/src/unix/process.c ---- node-v12.10.0/deps/uv/src/unix/process.c 2019-09-04 18:36:23.000000000 +0300 -+++ node-v12.10.0.mod/deps/uv/src/unix/process.c 2019-09-23 01:39:39.069030779 +0300 -@@ -351,27 +351,6 @@ - _exit(127); - } +--- ./deps/uv/src/unix/process.c 2021-09-28 12:58:06.000000000 +0530 ++++ ./deps/uv/src/unix/process.c.mod 2021-09-28 19:20:44.656430897 +0530 +@@ -283,17 +283,6 @@ + if (options->cwd != NULL && chdir(options->cwd)) + uv__write_errno(error_fd); - if (options->flags & (UV_PROCESS_SETUID | UV_PROCESS_SETGID)) { - /* When dropping privileges from root, the `setgroups` call will @@ -16,16 +15,6 @@ diff -uNr node-v12.10.0/deps/uv/src/unix/process.c node-v12.10.0.mod/deps/uv/src - SAVE_ERRNO(setgroups(0, NULL)); - } - -- if ((options->flags & UV_PROCESS_SETGID) && setgid(options->gid)) { -- uv__write_int(error_fd, UV__ERR(errno)); -- _exit(127); -- } -- -- if ((options->flags & UV_PROCESS_SETUID) && setuid(options->uid)) { -- uv__write_int(error_fd, UV__ERR(errno)); -- _exit(127); -- } -- - if (options->env != NULL) { - environ = options->env; - } + if ((options->flags & UV_PROCESS_SETGID) && setgid(options->gid)) + uv__write_errno(error_fd); + diff --git a/packages/nodejs-lts/deps-uv-uv.gyp.patch b/packages/nodejs-lts/deps-uv-uv.gyp.patch index c19f5c1c2..a17f50845 100644 --- a/packages/nodejs-lts/deps-uv-uv.gyp.patch +++ b/packages/nodejs-lts/deps-uv-uv.gyp.patch @@ -1,7 +1,6 @@ -diff -u -r ../node-v9.7.1/deps/uv/uv.gyp ./deps/uv/uv.gyp ---- ../node-v9.7.1/deps/uv/uv.gyp 2018-03-02 01:58:02.000000000 +0000 -+++ ./deps/uv/uv.gyp 2018-03-05 10:51:15.530165566 +0000 -@@ -39,7 +39,7 @@ +--- ./deps/uv/uv.gyp 2021-09-29 08:14:37.300738421 +0530 ++++ ./deps/uv/uv.gyp.mod 2021-09-29 08:15:04.980738410 +0530 +@@ -40,7 +40,7 @@ { 'target_name': 'libuv', 'type': '<(uv_library)', @@ -10,7 +9,7 @@ diff -u -r ../node-v9.7.1/deps/uv/uv.gyp ./deps/uv/uv.gyp 'include', 'src/', ], -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ '<@(shared_unix_defines)', '<@(shared_zos_defines)', ], @@ -19,3 +18,11 @@ diff -u -r ../node-v9.7.1/deps/uv/uv.gyp ./deps/uv/uv.gyp 'conditions': [ ['OS == "linux"', { 'defines': [ '_POSIX_C_SOURCE=200112' ], +@@ -253,6 +253,7 @@ + }], + [ 'OS=="android"', { + 'sources': [ ++ 'src/unix/epoll.c', + 'src/unix/linux-core.c', + 'src/unix/linux-inotify.c', + 'src/unix/linux-syscalls.c', diff --git a/packages/nodejs-lts/node.gyp.patch b/packages/nodejs-lts/node.gyp.patch index 9c63aae39..0843c55c5 100644 --- a/packages/nodejs-lts/node.gyp.patch +++ b/packages/nodejs-lts/node.gyp.patch @@ -1,6 +1,6 @@ ---- ./node.gyp.orig 2021-08-30 23:04:29.000000000 +0530 -+++ ./node.gyp 2021-09-14 14:06:54.617184886 +0530 -@@ -550,6 +550,7 @@ +--- ./node.gyp.orig 2021-09-28 12:58:08.000000000 +0530 ++++ ./node.gyp 2021-09-28 19:24:53.409789011 +0530 +@@ -340,6 +340,7 @@ 'include_dirs': [ 'src', @@ -8,7 +8,7 @@ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h ], 'dependencies': [ -@@ -1215,101 +1216,6 @@ +@@ -1016,103 +1017,6 @@ }], ], }, # fuzz_env @@ -18,6 +18,8 @@ - - 'dependencies': [ - '<(node_lib_target_name)', +- 'deps/googletest/googletest.gyp:gtest', +- 'deps/googletest/googletest.gyp:gtest_main', - 'deps/histogram/histogram.gyp:histogram', - 'deps/uvwasi/uvwasi.gyp:uvwasi', - 'node_dtrace_header', @@ -48,8 +50,6 @@ - 'sources': [ - 'src/node_snapshot_stub.cc', - 'src/node_code_cache_stub.cc', -- 'test/cctest/gtest/gtest-all.cc', -- 'test/cctest/gtest/gtest_main.cc', - 'test/cctest/node_test_fixture.cc', - 'test/cctest/node_test_fixture.h', - 'test/cctest/test_aliased_buffer.cc', @@ -57,7 +57,9 @@ - 'test/cctest/test_base_object_ptr.cc', - 'test/cctest/test_node_postmortem_metadata.cc', - 'test/cctest/test_environment.cc', +- 'test/cctest/test_js_native_api_v8.cc', - 'test/cctest/test_linked_binding.cc', +- 'test/cctest/test_node_api.cc', - 'test/cctest/test_per_process.cc', - 'test/cctest/test_platform.cc', - 'test/cctest/test_json_utils.cc',