From b1a9c9c562e185756de5f7a111ca86e98f54982d Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 11 Sep 2018 23:51:55 +0200 Subject: [PATCH] nodejs: Just keep a single current package Drop the LTS version of node.js for now and keep only a single current node package. --- .../nodejs-lts}/build.sh | 11 +- .../nodejs-lts}/deps-uv-uv.gyp.patch | 6 +- .../nodejs-lts}/fix-hardcoded-paths.patch | 0 .../nodejs-lts}/lib-child_process.js.patch | 0 disabled-packages/nodejs-lts/lib-os.js.patch | 12 ++ .../nodejs-lts}/node.gyp.patch | 10 +- .../nodejs-lts}/npm-link-patch.patch | 0 .../nodejs-lts}/src-cares_wrap.cc.patch | 0 .../nodejs-lts/src-node.cc.patch | 52 +++++++ .../nodejs-lts}/src-node_main.cc.patch | 0 packages/nodejs-current/lib-os.js.patch | 12 -- packages/nodejs-current/src-node.cc.patch | 37 ----- packages/nodejs/build.sh | 13 +- packages/nodejs/deps-uv-uv.gyp.patch | 17 ++- .../deps-v8-gypfiles-v8.gyp.patch | 0 packages/nodejs/lib-os.js.patch | 14 +- packages/nodejs/node.gyp.patch | 139 ++---------------- packages/nodejs/npm-tmp-patch.patch | 12 -- packages/nodejs/src-node.cc.patch | 71 ++++----- .../src-node_internals.h.patch | 0 .../src-node_process.cc.patch | 0 packages/yarn/build.sh | 2 +- 22 files changed, 139 insertions(+), 269 deletions(-) rename {packages/nodejs-current => disabled-packages/nodejs-lts}/build.sh (81%) rename {packages/nodejs-current => disabled-packages/nodejs-lts}/deps-uv-uv.gyp.patch (72%) rename {packages/nodejs-current => disabled-packages/nodejs-lts}/fix-hardcoded-paths.patch (100%) rename {packages/nodejs-current => disabled-packages/nodejs-lts}/lib-child_process.js.patch (100%) create mode 100644 disabled-packages/nodejs-lts/lib-os.js.patch rename {packages/nodejs-current => disabled-packages/nodejs-lts}/node.gyp.patch (86%) rename {packages/nodejs-current => disabled-packages/nodejs-lts}/npm-link-patch.patch (100%) rename {packages/nodejs-current => disabled-packages/nodejs-lts}/src-cares_wrap.cc.patch (100%) create mode 100644 disabled-packages/nodejs-lts/src-node.cc.patch rename {packages/nodejs-current => disabled-packages/nodejs-lts}/src-node_main.cc.patch (100%) delete mode 100644 packages/nodejs-current/lib-os.js.patch delete mode 100644 packages/nodejs-current/src-node.cc.patch rename packages/{nodejs-current => nodejs}/deps-v8-gypfiles-v8.gyp.patch (100%) delete mode 100644 packages/nodejs/npm-tmp-patch.patch rename packages/{nodejs-current => nodejs}/src-node_internals.h.patch (100%) rename packages/{nodejs-current => nodejs}/src-node_process.cc.patch (100%) diff --git a/packages/nodejs-current/build.sh b/disabled-packages/nodejs-lts/build.sh similarity index 81% rename from packages/nodejs-current/build.sh rename to disabled-packages/nodejs-lts/build.sh index dd1bf974f..42aebe02b 100644 --- a/packages/nodejs-current/build.sh +++ b/disabled-packages/nodejs-lts/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" -TERMUX_PKG_VERSION=10.9.0 -TERMUX_PKG_SHA256=d17ef8eb72d6a31f50a663d554beb9bcb55aa2ce57cf189abfc9b1ba20530d02 +TERMUX_PKG_VERSION=8.12.0 +TERMUX_PKG_SHA256=5a9dff58016c18fb4bf902d963b124ff058a550ebcd9840c677757387bce419a TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # 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 @@ -12,7 +12,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="nodejs" termux_step_configure () { - local DEST_CPU if [ $TERMUX_ARCH = "arm" ]; then DEST_CPU="arm" elif [ $TERMUX_ARCH = "i686" ]; then @@ -26,9 +25,6 @@ termux_step_configure () { fi export GYP_DEFINES="host_os=linux" - export CC_host=gcc - export CXX_host=g++ - export LINK_host=g++ # See note above TERMUX_PKG_DEPENDS why we do not use a shared libuv. ./configure \ @@ -42,7 +38,4 @@ termux_step_configure () { --without-intl \ --without-snapshot \ --cross-compiling - - perl -p -i -e 's/LIBS := \$\(LIBS\)/LIBS := -lpthread/' \ - $TERMUX_PKG_SRCDIR/out/deps/v8/gypfiles/torque.host.mk } diff --git a/packages/nodejs-current/deps-uv-uv.gyp.patch b/disabled-packages/nodejs-lts/deps-uv-uv.gyp.patch similarity index 72% rename from packages/nodejs-current/deps-uv-uv.gyp.patch rename to disabled-packages/nodejs-lts/deps-uv-uv.gyp.patch index c19f5c1c2..9af9da610 100644 --- a/packages/nodejs-current/deps-uv-uv.gyp.patch +++ b/disabled-packages/nodejs-lts/deps-uv-uv.gyp.patch @@ -1,6 +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 +diff -u -r ../node-v8.12.0/deps/uv/uv.gyp ./deps/uv/uv.gyp +--- ../node-v8.12.0/deps/uv/uv.gyp 2018-09-10 18:46:54.000000000 +0000 ++++ ./deps/uv/uv.gyp 2018-09-11 20:52:40.320690510 +0000 @@ -39,7 +39,7 @@ { 'target_name': 'libuv', diff --git a/packages/nodejs-current/fix-hardcoded-paths.patch b/disabled-packages/nodejs-lts/fix-hardcoded-paths.patch similarity index 100% rename from packages/nodejs-current/fix-hardcoded-paths.patch rename to disabled-packages/nodejs-lts/fix-hardcoded-paths.patch diff --git a/packages/nodejs-current/lib-child_process.js.patch b/disabled-packages/nodejs-lts/lib-child_process.js.patch similarity index 100% rename from packages/nodejs-current/lib-child_process.js.patch rename to disabled-packages/nodejs-lts/lib-child_process.js.patch diff --git a/disabled-packages/nodejs-lts/lib-os.js.patch b/disabled-packages/nodejs-lts/lib-os.js.patch new file mode 100644 index 000000000..9f3e97657 --- /dev/null +++ b/disabled-packages/nodejs-lts/lib-os.js.patch @@ -0,0 +1,12 @@ +diff -u -r ../node-v5.10.0/lib/os.js ./lib/os.js +--- ../node-v5.10.0/lib/os.js 2016-03-31 21:52:17.000000000 -0400 ++++ ./lib/os.js 2016-04-04 04:46:05.148105544 -0400 +@@ -36,7 +36,7 @@ + path = process.env.TMPDIR || + process.env.TMP || + process.env.TEMP || +- '/tmp'; ++ '@TERMUX_PREFIX@/tmp'; + if (path.length > 1 && path.endsWith('/')) + path = path.slice(0, -1); + } diff --git a/packages/nodejs-current/node.gyp.patch b/disabled-packages/nodejs-lts/node.gyp.patch similarity index 86% rename from packages/nodejs-current/node.gyp.patch rename to disabled-packages/nodejs-lts/node.gyp.patch index 765587831..86aaae11f 100644 --- a/packages/nodejs-current/node.gyp.patch +++ b/disabled-packages/nodejs-lts/node.gyp.patch @@ -1,7 +1,7 @@ -diff -u -r ../node-v10.9.0/node.gyp ./node.gyp ---- ../node-v10.9.0/node.gyp 2018-08-15 13:53:34.000000000 +0000 -+++ ./node.gyp 2018-08-23 20:43:38.262489188 +0000 -@@ -925,72 +925,6 @@ +diff -u -r ../node-v8.12.0/node.gyp ./node.gyp +--- ../node-v8.12.0/node.gyp 2018-09-10 18:47:03.000000000 +0000 ++++ ./node.gyp 2018-09-11 20:53:55.711827836 +0000 +@@ -889,70 +889,6 @@ ], } ], ] @@ -41,8 +41,6 @@ diff -u -r ../node-v10.9.0/node.gyp ./node.gyp - 'test/cctest/test_base64.cc', - 'test/cctest/test_node_postmortem_metadata.cc', - 'test/cctest/test_environment.cc', -- 'test/cctest/test_platform.cc', -- 'test/cctest/test_traced_value.cc', - 'test/cctest/test_util.cc', - 'test/cctest/test_url.cc' - ], diff --git a/packages/nodejs-current/npm-link-patch.patch b/disabled-packages/nodejs-lts/npm-link-patch.patch similarity index 100% rename from packages/nodejs-current/npm-link-patch.patch rename to disabled-packages/nodejs-lts/npm-link-patch.patch diff --git a/packages/nodejs-current/src-cares_wrap.cc.patch b/disabled-packages/nodejs-lts/src-cares_wrap.cc.patch similarity index 100% rename from packages/nodejs-current/src-cares_wrap.cc.patch rename to disabled-packages/nodejs-lts/src-cares_wrap.cc.patch diff --git a/disabled-packages/nodejs-lts/src-node.cc.patch b/disabled-packages/nodejs-lts/src-node.cc.patch new file mode 100644 index 000000000..d748ef845 --- /dev/null +++ b/disabled-packages/nodejs-lts/src-node.cc.patch @@ -0,0 +1,52 @@ +Without this patch functions such as process.getgroups +are not built on Android, which breaks things such as +npm/node_modules/which/which.js. + +diff -u -r ../node-v4.0.0/src/node.cc ./src/node.cc +--- ../node-v4.0.0/src/node.cc 2015-09-08 11:30:45.000000000 -0400 ++++ ./src/node.cc 2015-09-08 19:06:39.415724588 -0400 +@@ -69,7 +69,7 @@ + #include // setuid, getuid + #endif + +-#if defined(__POSIX__) && !defined(__ANDROID__) ++#if defined(__POSIX__) + #include // getpwnam() + #include // getgrnam() + #endif +@@ -1590,7 +1590,7 @@ + } + + +-#if defined(__POSIX__) && !defined(__ANDROID__) ++#if defined(__POSIX__) + + static const uid_t uid_not_found = static_cast(-1); + static const gid_t gid_not_found = static_cast(-1); +@@ -1910,7 +1910,7 @@ + } + } + +-#endif // __POSIX__ && !defined(__ANDROID__) ++#endif // __POSIX__ + + + void Exit(const FunctionCallbackInfo& args) { +@@ -2866,7 +2866,7 @@ + + env->SetMethod(process, "umask", Umask); + +-#if defined(__POSIX__) && !defined(__ANDROID__) ++#if defined(__POSIX__) + env->SetMethod(process, "getuid", GetUid); + env->SetMethod(process, "geteuid", GetEUid); + env->SetMethod(process, "setuid", SetUid); +@@ -2880,7 +2880,7 @@ + env->SetMethod(process, "getgroups", GetGroups); + env->SetMethod(process, "setgroups", SetGroups); + env->SetMethod(process, "initgroups", InitGroups); +-#endif // __POSIX__ && !defined(__ANDROID__) ++#endif // __POSIX__ + + env->SetMethod(process, "_kill", Kill); + diff --git a/packages/nodejs-current/src-node_main.cc.patch b/disabled-packages/nodejs-lts/src-node_main.cc.patch similarity index 100% rename from packages/nodejs-current/src-node_main.cc.patch rename to disabled-packages/nodejs-lts/src-node_main.cc.patch diff --git a/packages/nodejs-current/lib-os.js.patch b/packages/nodejs-current/lib-os.js.patch deleted file mode 100644 index 02d345fa5..000000000 --- a/packages/nodejs-current/lib-os.js.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../node-v10.9.0/lib/os.js ./lib/os.js ---- ../node-v10.9.0/lib/os.js 2018-08-15 13:53:34.000000000 +0000 -+++ ./lib/os.js 2018-08-23 20:42:39.611186774 +0000 -@@ -130,7 +130,7 @@ - path = safeGetenv('TMPDIR') || - safeGetenv('TMP') || - safeGetenv('TEMP') || -- '/tmp'; -+ '@TERMUX_PREFIX@/tmp'; - if (path.length > 1 && path.endsWith('/')) - path = path.slice(0, -1); - } diff --git a/packages/nodejs-current/src-node.cc.patch b/packages/nodejs-current/src-node.cc.patch deleted file mode 100644 index df51d5cfe..000000000 --- a/packages/nodejs-current/src-node.cc.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -u -r ../node-v10.9.0/src/node.cc ./src/node.cc ---- ../node-v10.9.0/src/node.cc 2018-08-15 13:53:34.000000000 +0000 -+++ ./src/node.cc 2018-08-23 20:49:59.353995878 +0000 -@@ -106,7 +106,7 @@ - #include // setuid, getuid - #endif - --#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) -+#if defined(__POSIX__) && !defined(__CloudABI__) - #include // getpwnam() - #include // getgrnam() - #endif -@@ -690,7 +690,7 @@ - - // Look up environment variable unless running as setuid root. - bool SafeGetenv(const char* key, std::string* text) { --#if !defined(__CloudABI__) && !defined(_WIN32) -+#if !defined(__CloudABI__) && !defined(_WIN32) && !defined(__ANDROID__) - if (linux_at_secure || getuid() != geteuid() || getgid() != getegid()) - goto fail; - #endif -@@ -2402,13 +2402,13 @@ - env->SetMethod(process, "reallyExit", Exit); - env->SetMethodNoSideEffect(process, "uptime", Uptime); - --#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) -+#if defined(__POSIX__) && !defined(__CloudABI__) - env->SetMethodNoSideEffect(process, "getuid", GetUid); - env->SetMethodNoSideEffect(process, "geteuid", GetEUid); - env->SetMethodNoSideEffect(process, "getgid", GetGid); - env->SetMethodNoSideEffect(process, "getegid", GetEGid); - env->SetMethodNoSideEffect(process, "getgroups", GetGroups); --#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__) -+#endif // __POSIX__ && !defined(__CloudABI__) - } - - diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 0d84d590d..725268239 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" -TERMUX_PKG_VERSION=8.11.4 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=fbce7de6d96b0bcb0db0bf77f0e6ea999b6755e6930568aedaab06847552a609 +TERMUX_PKG_VERSION=10.10.0 +TERMUX_PKG_SHA256=860eff976d83dd619849c0b4fab4cadb093ece2c718aaa5af8fb5ebbfa7d8a80 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # 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 @@ -11,8 +10,10 @@ TERMUX_PKG_DEPENDS="openssl, c-ares" 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=yes TERMUX_PKG_CONFLICTS="nodejs-current" +TERMUX_PKG_REPLACES="nodejs-current" termux_step_configure () { + local DEST_CPU if [ $TERMUX_ARCH = "arm" ]; then DEST_CPU="arm" elif [ $TERMUX_ARCH = "i686" ]; then @@ -26,6 +27,9 @@ termux_step_configure () { fi export GYP_DEFINES="host_os=linux" + export CC_host=gcc + export CXX_host=g++ + export LINK_host=g++ # See note above TERMUX_PKG_DEPENDS why we do not use a shared libuv. ./configure \ @@ -39,4 +43,7 @@ termux_step_configure () { --without-intl \ --without-snapshot \ --cross-compiling + + perl -p -i -e 's/LIBS := \$\(LIBS\)/LIBS := -lpthread/' \ + $TERMUX_PKG_SRCDIR/out/deps/v8/gypfiles/torque.host.mk } diff --git a/packages/nodejs/deps-uv-uv.gyp.patch b/packages/nodejs/deps-uv-uv.gyp.patch index 3f6375b8a..c19f5c1c2 100644 --- a/packages/nodejs/deps-uv-uv.gyp.patch +++ b/packages/nodejs/deps-uv-uv.gyp.patch @@ -1,7 +1,7 @@ -diff -u -r ../node-v8.1.4/deps/uv/uv.gyp ./deps/uv/uv.gyp ---- ../node-v8.1.4/deps/uv/uv.gyp 2017-07-11 05:48:01.000000000 +0200 -+++ ./deps/uv/uv.gyp 2017-07-19 01:25:10.988614742 +0200 -@@ -45,12 +45,12 @@ +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 @@ { 'target_name': 'libuv', 'type': '<(uv_library)', @@ -10,9 +10,12 @@ diff -u -r ../node-v8.1.4/deps/uv/uv.gyp ./deps/uv/uv.gyp 'include', 'src/', ], - 'direct_dependent_settings': { +@@ -54,7 +54,7 @@ + '<@(shared_unix_defines)', + '<@(shared_zos_defines)', + ], - 'include_dirs': [ 'include' ], + 'include_dirs+': [ 'include' ], 'conditions': [ - ['OS != "win"', { - 'defines': [ + ['OS == "linux"', { + 'defines': [ '_POSIX_C_SOURCE=200112' ], diff --git a/packages/nodejs-current/deps-v8-gypfiles-v8.gyp.patch b/packages/nodejs/deps-v8-gypfiles-v8.gyp.patch similarity index 100% rename from packages/nodejs-current/deps-v8-gypfiles-v8.gyp.patch rename to packages/nodejs/deps-v8-gypfiles-v8.gyp.patch diff --git a/packages/nodejs/lib-os.js.patch b/packages/nodejs/lib-os.js.patch index 9f3e97657..02d345fa5 100644 --- a/packages/nodejs/lib-os.js.patch +++ b/packages/nodejs/lib-os.js.patch @@ -1,10 +1,10 @@ -diff -u -r ../node-v5.10.0/lib/os.js ./lib/os.js ---- ../node-v5.10.0/lib/os.js 2016-03-31 21:52:17.000000000 -0400 -+++ ./lib/os.js 2016-04-04 04:46:05.148105544 -0400 -@@ -36,7 +36,7 @@ - path = process.env.TMPDIR || - process.env.TMP || - process.env.TEMP || +diff -u -r ../node-v10.9.0/lib/os.js ./lib/os.js +--- ../node-v10.9.0/lib/os.js 2018-08-15 13:53:34.000000000 +0000 ++++ ./lib/os.js 2018-08-23 20:42:39.611186774 +0000 +@@ -130,7 +130,7 @@ + path = safeGetenv('TMPDIR') || + safeGetenv('TMP') || + safeGetenv('TEMP') || - '/tmp'; + '@TERMUX_PREFIX@/tmp'; if (path.length > 1 && path.endsWith('/')) diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch index c7c1fd48c..765587831 100644 --- a/packages/nodejs/node.gyp.patch +++ b/packages/nodejs/node.gyp.patch @@ -1,7 +1,7 @@ -diff -u -r ../node-v8.11.2/node.gyp ./node.gyp ---- ../node-v8.11.2/node.gyp 2018-05-15 19:09:49.000000000 +0000 -+++ ./node.gyp 2018-05-18 01:32:14.331981675 +0000 -@@ -876,191 +876,6 @@ +diff -u -r ../node-v10.9.0/node.gyp ./node.gyp +--- ../node-v10.9.0/node.gyp 2018-08-15 13:53:34.000000000 +0000 ++++ ./node.gyp 2018-08-23 20:43:38.262489188 +0000 +@@ -925,72 +925,6 @@ ], } ], ] @@ -11,7 +11,7 @@ diff -u -r ../node-v8.11.2/node.gyp ./node.gyp - 'type': 'executable', - - 'dependencies': [ -- '<(node_core_target_name)', +- '<(node_lib_target_name)', - 'rename_node_bin_win', - 'deps/gtest/gtest.gyp:gtest', - 'node_js2c#host', @@ -20,39 +20,6 @@ diff -u -r ../node-v8.11.2/node.gyp ./node.gyp - 'node_dtrace_provider', - ], - -- 'variables': { -- 'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen', -- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing', -- 'OBJ_SUFFIX': 'o', -- 'OBJ_SEPARATOR': '/', -- 'conditions': [ -- ['OS=="win"', { -- 'OBJ_SUFFIX': 'obj', -- }], -- ['GENERATOR=="ninja"', { -- 'OBJ_PATH': '<(OBJ_DIR)/src', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/gen', -- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing', -- 'OBJ_SEPARATOR': '/<(node_lib_target_name).', -- }, { -- 'conditions': [ -- ['OS=="win"', { -- 'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)', -- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)', -- }], -- ['OS=="aix"', { -- 'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen', -- 'OBJ_TRACING_PATH': -- '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing', -- }], -- ]} -- ] -- ], -- }, -- - 'includes': [ - 'node.gypi' - ], @@ -69,127 +36,41 @@ diff -u -r ../node-v8.11.2/node.gyp ./node.gyp - 'defines': [ 'NODE_WANT_INTERNALS=1' ], - - 'sources': [ -- 'test/cctest/node_module_reg.cc', - 'test/cctest/node_test_fixture.cc', - 'test/cctest/test_aliased_buffer.cc', - 'test/cctest/test_base64.cc', +- 'test/cctest/test_node_postmortem_metadata.cc', - 'test/cctest/test_environment.cc', +- 'test/cctest/test_platform.cc', +- 'test/cctest/test_traced_value.cc', - 'test/cctest/test_util.cc', - 'test/cctest/test_url.cc' - ], - -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)', -- '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)', -- '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)', -- '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)', -- '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)', -- '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)', -- ], -- - 'conditions': [ - [ 'node_use_openssl=="true"', { -- 'conditions': [ -- ['node_target_type!="static_library"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)', -- ], -- }], -- ], - 'defines': [ - 'HAVE_OPENSSL=1', - ], - }], - [ 'node_use_perfctr=="true"', { - 'defines': [ 'HAVE_PERFCTR=1' ], -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)' -- 'node_win32_perfctr_provider.<(OBJ_SUFFIX)', -- ], - }], - ['v8_enable_inspector==1', { - 'sources': [ - 'test/cctest/test_inspector_socket.cc', - 'test/cctest/test_inspector_socket_server.cc' - ], -- 'conditions': [ -- ['node_target_type!="static_library"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)', -- ], -- }], -- ], - 'defines': [ - 'HAVE_INSPECTOR=1', - ], -- }], -- [ 'node_use_dtrace=="true" and node_target_type!="static_library"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', -- ], -- 'conditions': [ -- ['OS!="mac" and OS!="linux"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)', -- ] -- }], -- ['OS=="linux"', { -- 'libraries': [ -- '<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)' -- 'node_dtrace_provider.<(OBJ_SUFFIX)', -- ] -- }], -- ], - }, { -- 'conditions': [ -- [ 'node_use_etw=="true" and OS=="win"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)' -- 'node_win32_etw_provider.<(OBJ_SUFFIX)', -- ], -- }] -- ] -- }], -- [ 'OS=="win" and node_target_type!="static_library"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)', -- ], -- }, { -- 'conditions': [ -- ['node_target_type!="static_library"', { -- 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)', -- ], -- }], -- ], +- 'defines': [ 'HAVE_INSPECTOR=0' ] - }], - ['OS=="solaris"', { - 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ] - }], -- ] +- ], } ], # end targets diff --git a/packages/nodejs/npm-tmp-patch.patch b/packages/nodejs/npm-tmp-patch.patch deleted file mode 100644 index ac8a760fd..000000000 --- a/packages/nodejs/npm-tmp-patch.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../node-v0.12.7/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js ./deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js ---- ../node-v0.12.7/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js 2015-07-09 18:41:19.000000000 -0400 -+++ ./deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js 2015-07-24 20:56:42.278310940 -0400 -@@ -14,7 +14,7 @@ - path = process.env.TMPDIR || - process.env.TMP || - process.env.TEMP || -- '/tmp'; -+ '@TERMUX_PREFIX@/tmp'; - } - - if (trailingSlashRe.test(path)) { diff --git a/packages/nodejs/src-node.cc.patch b/packages/nodejs/src-node.cc.patch index d748ef845..df51d5cfe 100644 --- a/packages/nodejs/src-node.cc.patch +++ b/packages/nodejs/src-node.cc.patch @@ -1,52 +1,37 @@ -Without this patch functions such as process.getgroups -are not built on Android, which breaks things such as -npm/node_modules/which/which.js. - -diff -u -r ../node-v4.0.0/src/node.cc ./src/node.cc ---- ../node-v4.0.0/src/node.cc 2015-09-08 11:30:45.000000000 -0400 -+++ ./src/node.cc 2015-09-08 19:06:39.415724588 -0400 -@@ -69,7 +69,7 @@ +diff -u -r ../node-v10.9.0/src/node.cc ./src/node.cc +--- ../node-v10.9.0/src/node.cc 2018-08-15 13:53:34.000000000 +0000 ++++ ./src/node.cc 2018-08-23 20:49:59.353995878 +0000 +@@ -106,7 +106,7 @@ #include // setuid, getuid #endif --#if defined(__POSIX__) && !defined(__ANDROID__) -+#if defined(__POSIX__) +-#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) ++#if defined(__POSIX__) && !defined(__CloudABI__) #include // getpwnam() #include // getgrnam() #endif -@@ -1590,7 +1590,7 @@ +@@ -690,7 +690,7 @@ + + // Look up environment variable unless running as setuid root. + bool SafeGetenv(const char* key, std::string* text) { +-#if !defined(__CloudABI__) && !defined(_WIN32) ++#if !defined(__CloudABI__) && !defined(_WIN32) && !defined(__ANDROID__) + if (linux_at_secure || getuid() != geteuid() || getgid() != getegid()) + goto fail; + #endif +@@ -2402,13 +2402,13 @@ + env->SetMethod(process, "reallyExit", Exit); + env->SetMethodNoSideEffect(process, "uptime", Uptime); + +-#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) ++#if defined(__POSIX__) && !defined(__CloudABI__) + env->SetMethodNoSideEffect(process, "getuid", GetUid); + env->SetMethodNoSideEffect(process, "geteuid", GetEUid); + env->SetMethodNoSideEffect(process, "getgid", GetGid); + env->SetMethodNoSideEffect(process, "getegid", GetEGid); + env->SetMethodNoSideEffect(process, "getgroups", GetGroups); +-#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__) ++#endif // __POSIX__ && !defined(__CloudABI__) } --#if defined(__POSIX__) && !defined(__ANDROID__) -+#if defined(__POSIX__) - - static const uid_t uid_not_found = static_cast(-1); - static const gid_t gid_not_found = static_cast(-1); -@@ -1910,7 +1910,7 @@ - } - } - --#endif // __POSIX__ && !defined(__ANDROID__) -+#endif // __POSIX__ - - - void Exit(const FunctionCallbackInfo& args) { -@@ -2866,7 +2866,7 @@ - - env->SetMethod(process, "umask", Umask); - --#if defined(__POSIX__) && !defined(__ANDROID__) -+#if defined(__POSIX__) - env->SetMethod(process, "getuid", GetUid); - env->SetMethod(process, "geteuid", GetEUid); - env->SetMethod(process, "setuid", SetUid); -@@ -2880,7 +2880,7 @@ - env->SetMethod(process, "getgroups", GetGroups); - env->SetMethod(process, "setgroups", SetGroups); - env->SetMethod(process, "initgroups", InitGroups); --#endif // __POSIX__ && !defined(__ANDROID__) -+#endif // __POSIX__ - - env->SetMethod(process, "_kill", Kill); - diff --git a/packages/nodejs-current/src-node_internals.h.patch b/packages/nodejs/src-node_internals.h.patch similarity index 100% rename from packages/nodejs-current/src-node_internals.h.patch rename to packages/nodejs/src-node_internals.h.patch diff --git a/packages/nodejs-current/src-node_process.cc.patch b/packages/nodejs/src-node_process.cc.patch similarity index 100% rename from packages/nodejs-current/src-node_process.cc.patch rename to packages/nodejs/src-node_process.cc.patch diff --git a/packages/yarn/build.sh b/packages/yarn/build.sh index c6f648698..b528ea5b2 100644 --- a/packages/yarn/build.sh +++ b/packages/yarn/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://yarnpkg.com/ TERMUX_PKG_DESCRIPTION="Fast, reliable, and secure dependency management" TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff" -TERMUX_PKG_DEPENDS="nodejs | nodejs-current" +TERMUX_PKG_DEPENDS="nodejs" TERMUX_PKG_VERSION=1.9.4 TERMUX_PKG_SHA256=7667eb715077b4bad8e2a832e7084e0e6f1ba54d7280dc573c8f7031a7fb093e TERMUX_PKG_SRCURL=https://yarnpkg.com/downloads/${TERMUX_PKG_VERSION}/yarn-v${TERMUX_PKG_VERSION}.tar.gz