nodejs-current: Update from 9.4.0 to 9.5.0

diff --git a/packages/nodejs-current/build.sh b/packages/nodejs-current/build.sh
index 4a3ef65..c4b28f7 100644 (file)
--- 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.4.0
-TERMUX_PKG_SHA256=7503e1f0f81288ff6e56009c0f399c0b5ebfe6f446734c5beb2d45393b21b20c
+TERMUX_PKG_VERSION=9.5.0
+TERMUX_PKG_SHA256=666b463a378b65bb83afb8f2c271865e03804d5930c95688ab4020c5dcd5146d
 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 27868ae..1e9e2ae 100644 (file)
--- a/packages/nodejs-current/node.gyp.patch
+++ b/packages/nodejs-current/node.gyp.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -u -r ../node-v9.5.0/node.gyp ./node.gyp
+--- ../node-v9.5.0/node.gyp    2018-01-31 22:27:10.000000000 +0100
++++ ./node.gyp 2018-02-01 10:59:10.485827738 +0100
+@@ -887,191 +887,6 @@
            ],
          } ],
        ]
@@ -12,6 +12,7 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp
 -
 -      'dependencies': [
 -        '<(node_core_target_name)',
+-        'rename_node_bin_win',
 -        'deps/gtest/gtest.gyp:gtest',
 -        'node_js2c#host',
 -        'node_dtrace_header',
@@ -20,9 +21,9 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp
 -      ],
 -
 -      'variables': {
--        'OBJ_PATH': '<(OBJ_DIR)/node/src',
--        'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen',
--        'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing',
+-        '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': [
@@ -33,18 +34,19 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp
 -            'OBJ_PATH': '<(OBJ_DIR)/src',
 -            'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
 -            'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
--            'OBJ_SEPARATOR': '/node.',
+-            'OBJ_SEPARATOR': '/<(node_lib_target_name).',
 -          }, {
 -            'conditions': [
 -              ['OS=="win"', {
--                'OBJ_PATH': '<(OBJ_DIR)/node',
--                'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
--                'OBJ_TRACING_PATH': '<(OBJ_DIR)/node',
+-                '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_base/src',
--                'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen',
--                'OBJ_TRACING_PATH': '<(OBJ_DIR)/node_base/src/tracing',
+-                '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',
 -              }],
 -            ]}
 -          ]
@@ -76,62 +78,73 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp
 -        'test/cctest/test_url.cc'
 -      ],
 -
--      'sources!': [
--        'src/node_main.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_target_type!="static_library"', {
--          '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)',
--          ],
--        }],
 -        [ 'node_use_openssl=="true"', {
--          '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)',
+-          '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'
 -          ],
--          '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)',
+-          '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"', {
+-        [ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
 -          'libraries': [
 -            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
 -          ],
@@ -144,82 +157,38 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp
 -            }],
 -            ['OS=="linux"', {
 -              'libraries': [
--                '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
+-                '<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
+-                  'node_dtrace_provider.<(OBJ_SUFFIX)',
 -              ]
 -            }],
 -          ],
--        }],
--        [ 'OS=="win"', {
--          'libraries': [
--            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
--           ],
 -        }, {
--          'libraries': [
--            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
--           ],
--        }],
--        [ 'node_shared_zlib=="false"', {
--          'dependencies': [
--            'deps/zlib/zlib.gyp:zlib',
--           ]
--        }],
--        [ 'node_shared_openssl=="false" and node_shared=="false"', {
--          'dependencies': [
--            'deps/openssl/openssl.gyp:openssl'
--          ]
--        }],
--        [ 'node_shared_http_parser=="false"', {
--          'dependencies': [
--            'deps/http_parser/http_parser.gyp:http_parser'
--          ]
--        }],
--        [ 'node_shared_libuv=="false"', {
--          'dependencies': [
--            'deps/uv/uv.gyp:libuv'
+-          '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)',
+-              ],
+-            }]
 -          ]
 -        }],
--        [ 'node_shared_nghttp2=="false"', {
--          'dependencies': [
--            'deps/nghttp2/nghttp2.gyp:nghttp2'
+-        [ 'OS=="win" and node_target_type!="static_library"', {
+-          'libraries': [
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
 -          ],
--          'include_dirs': [
--            'deps/nghttp2/lib/includes'
--          ]
--        }],
--        [ 'node_use_v8_platform=="true"', {
--          'dependencies': [
--            'deps/v8/src/v8.gyp:v8_libplatform',
+-        }, {
+-          'conditions': [
+-            ['node_target_type!="static_library"', {
+-              'libraries': [
+-                '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
+-              ],
+-            }],
 -          ],
 -        }],
 -        ['OS=="solaris"', {
 -          'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
 -        }],
--        [ 'node_use_openssl=="true"', {
--          'conditions': [
--            [ 'node_shared_openssl=="false"', {
--              'conditions': [
--                # -force_load or --whole-archive are not applicable for
--                # the static library
--                [ 'node_target_type!="static_library"', {
--                  'xcode_settings': {
--                    'OTHER_LDFLAGS': [
--                      '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
--                    ],
--                  },
--                  'conditions': [
--                    ['OS in "linux freebsd" and node_shared=="false"', {
--                      'ldflags': [
--                        '-Wl,--whole-archive,'
--                            '<(OBJ_DIR)/deps/openssl/'
--                            '<(OPENSSL_PRODUCT)',
--                        '-Wl,--no-whole-archive',
--                      ],
--                    }],
--                  ],
--                }],
--              ],
--            }]]
--        }],
 -      ]
      }
    ], # end targets