From 0906fedf61171ece35186a97c923b15bf862d4f3 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 14 Dec 2017 16:16:08 +0100 Subject: [PATCH] nodejs-current: Update from 9.2.1 to 9.3.0 --- packages/nodejs-current/build.sh | 4 +-- packages/nodejs-current/node.gyp.patch | 47 ++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/packages/nodejs-current/build.sh b/packages/nodejs-current/build.sh index 097de3ca..c9886338 100644 --- a/packages/nodejs-current/build.sh +++ b/packages/nodejs-current/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=9.2.1 -TERMUX_PKG_SHA256=200de3c145e79d5da5361ab079df199cec13dbd10902df9cf9a75c6546cd4582 +TERMUX_PKG_VERSION=9.3.0 +TERMUX_PKG_SHA256=b288075e2f09faf33046583271a4e85c34684b5b637973dd6eaa5445220c57cd 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 diff --git a/packages/nodejs-current/node.gyp.patch b/packages/nodejs-current/node.gyp.patch index 670bdd2a..27868ae6 100644 --- a/packages/nodejs-current/node.gyp.patch +++ b/packages/nodejs-current/node.gyp.patch @@ -1,7 +1,7 @@ -diff -u -r ../node-v9.2.0/node.gyp ./node.gyp ---- ../node-v9.2.0/node.gyp 2017-11-14 21:58:23.000000000 +0100 -+++ ./node.gyp 2017-11-15 01:48:02.957509658 +0100 -@@ -746,207 +746,6 @@ +diff -u -r ../node-v9.3.0/node.gyp ./node.gyp +--- ../node-v9.3.0/node.gyp 2017-12-12 10:22:41.000000000 +0000 ++++ ./node.gyp 2017-12-14 11:57:05.641536169 +0000 +@@ -753,222 +753,6 @@ ], } ], ] @@ -67,6 +67,7 @@ diff -u -r ../node-v9.2.0/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', @@ -82,7 +83,7 @@ diff -u -r ../node-v9.2.0/node.gyp ./node.gyp - 'conditions': [ - ['node_target_type!="static_library"', { - 'libraries': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)', +- '<(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)', @@ -110,6 +111,9 @@ diff -u -r ../node-v9.2.0/node.gyp ./node.gyp - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)', - '<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)', - ], +- 'defines': [ +- 'HAVE_OPENSSL=1', +- ], - }], - ['v8_enable_inspector==1', { - 'sources': [ @@ -130,7 +134,20 @@ diff -u -r ../node-v9.2.0/node.gyp ./node.gyp - [ 'node_use_dtrace=="true"', { - '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)/node_dtrace_provider.o', +- ] +- }], +- ], - }], - [ 'OS=="win"', { - 'libraries': [ @@ -141,16 +158,6 @@ diff -u -r ../node-v9.2.0/node.gyp ./node.gyp - '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)', - ], - }], -- [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', { -- 'copies': [{ -- 'destination': '<(OBJ_DIR)/cctest/src', -- 'files': [ -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)', -- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', -- ]}, -- ], -- }], - [ 'node_shared_zlib=="false"', { - 'dependencies': [ - 'deps/zlib/zlib.gyp:zlib', @@ -171,6 +178,14 @@ diff -u -r ../node-v9.2.0/node.gyp ./node.gyp - 'deps/uv/uv.gyp:libuv' - ] - }], +- [ 'node_shared_nghttp2=="false"', { +- 'dependencies': [ +- 'deps/nghttp2/nghttp2.gyp:nghttp2' +- ], +- 'include_dirs': [ +- 'deps/nghttp2/lib/includes' +- ] +- }], - [ 'node_use_v8_platform=="true"', { - 'dependencies': [ - 'deps/v8/src/v8.gyp:v8_libplatform', -- 2.11.0