nodejs-current: Update from 9.6.1 to 9.7.1

This commit is contained in:
Fredrik Fornwall 2018-03-05 12:31:03 +01:00
parent 2d8e6b3eb3
commit d4e9fa7096
3 changed files with 20 additions and 138 deletions

View File

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://nodejs.org/ 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_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
TERMUX_PKG_VERSION=9.6.1 TERMUX_PKG_VERSION=9.7.1
TERMUX_PKG_SHA256=b84c024d97b3f09ab55e352f91e038066afb44f8c49d13fdc298ffd8383d1112 TERMUX_PKG_SHA256=06fae194a1eb962cc6f69f74f5be9f7c022265e7b3c3d7b08872157d02929042
TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz 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 # 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 # linker, which does not use symbols of linked shared libraries when resolving

View File

@ -1,7 +1,7 @@
diff -u -r ../node-v8.1.4/deps/uv/uv.gyp ./deps/uv/uv.gyp diff -u -r ../node-v9.7.1/deps/uv/uv.gyp ./deps/uv/uv.gyp
--- ../node-v8.1.4/deps/uv/uv.gyp 2017-07-11 05:48:01.000000000 +0200 --- ../node-v9.7.1/deps/uv/uv.gyp 2018-03-02 01:58:02.000000000 +0000
+++ ./deps/uv/uv.gyp 2017-07-19 01:25:10.988614742 +0200 +++ ./deps/uv/uv.gyp 2018-03-05 10:51:15.530165566 +0000
@@ -45,12 +45,12 @@ @@ -39,7 +39,7 @@
{ {
'target_name': 'libuv', 'target_name': 'libuv',
'type': '<(uv_library)', 'type': '<(uv_library)',
@ -10,9 +10,12 @@ diff -u -r ../node-v8.1.4/deps/uv/uv.gyp ./deps/uv/uv.gyp
'include', 'include',
'src/', 'src/',
], ],
'direct_dependent_settings': { @@ -54,7 +54,7 @@
'<@(shared_unix_defines)',
'<@(shared_zos_defines)',
],
- 'include_dirs': [ 'include' ], - 'include_dirs': [ 'include' ],
+ 'include_dirs+': [ 'include' ], + 'include_dirs+': [ 'include' ],
'conditions': [ 'conditions': [
['OS != "win"', { ['OS == "linux"', {
'defines': [ 'defines': [ '_POSIX_C_SOURCE=200112' ],

View File

@ -1,7 +1,7 @@
diff -u -r ../node-v9.5.0/node.gyp ./node.gyp diff -u -r ../node-v9.7.1/node.gyp ./node.gyp
--- ../node-v9.5.0/node.gyp 2018-01-31 22:27:10.000000000 +0100 --- ../node-v9.7.1/node.gyp 2018-03-02 01:58:17.000000000 +0000
+++ ./node.gyp 2018-02-01 10:59:10.485827738 +0100 +++ ./node.gyp 2018-03-05 10:52:38.637165269 +0000
@@ -887,191 +887,6 @@ @@ -901,70 +901,6 @@
], ],
} ], } ],
] ]
@ -11,7 +11,7 @@ diff -u -r ../node-v9.5.0/node.gyp ./node.gyp
- 'type': 'executable', - 'type': 'executable',
- -
- 'dependencies': [ - 'dependencies': [
- '<(node_core_target_name)', - '<(node_lib_target_name)',
- 'rename_node_bin_win', - 'rename_node_bin_win',
- 'deps/gtest/gtest.gyp:gtest', - 'deps/gtest/gtest.gyp:gtest',
- 'node_js2c#host', - 'node_js2c#host',
@ -20,39 +20,6 @@ diff -u -r ../node-v9.5.0/node.gyp ./node.gyp
- 'node_dtrace_provider', - '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': [ - 'includes': [
- 'node.gypi' - 'node.gypi'
- ], - ],
@ -69,127 +36,39 @@ diff -u -r ../node-v9.5.0/node.gyp ./node.gyp
- 'defines': [ 'NODE_WANT_INTERNALS=1' ], - 'defines': [ 'NODE_WANT_INTERNALS=1' ],
- -
- 'sources': [ - 'sources': [
- 'test/cctest/node_module_reg.cc',
- 'test/cctest/node_test_fixture.cc', - 'test/cctest/node_test_fixture.cc',
- 'test/cctest/test_aliased_buffer.cc', - 'test/cctest/test_aliased_buffer.cc',
- 'test/cctest/test_base64.cc', - 'test/cctest/test_base64.cc',
- 'test/cctest/test_node_postmortem_metadata.cc',
- 'test/cctest/test_environment.cc', - 'test/cctest/test_environment.cc',
- 'test/cctest/test_util.cc', - 'test/cctest/test_util.cc',
- 'test/cctest/test_url.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': [ - 'conditions': [
- [ 'node_use_openssl=="true"', { - [ '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': [ - 'defines': [
- 'HAVE_OPENSSL=1', - 'HAVE_OPENSSL=1',
- ], - ],
- }], - }],
- [ 'node_use_perfctr=="true"', { - [ 'node_use_perfctr=="true"', {
- 'defines': [ 'HAVE_PERFCTR=1' ], - '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', { - ['v8_enable_inspector==1', {
- 'sources': [ - 'sources': [
- 'test/cctest/test_inspector_socket.cc', - 'test/cctest/test_inspector_socket.cc',
- 'test/cctest/test_inspector_socket_server.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': [ - 'defines': [
- 'HAVE_INSPECTOR=1', - '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': [ - 'defines': [ 'HAVE_INSPECTOR=0' ]
- [ '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)',
- ],
- }],
- ],
- }], - }],
- ['OS=="solaris"', { - ['OS=="solaris"', {
- 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ] - 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
- }], - }],
- ] - ],
} }
], # end targets ], # end targets