X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a3bc74c9eab15d758ef1ecb4ab21bb9f13c73632..36e77394c2f0eb617a6947dff765701614a795d1:/packages/nodejs-current/node.gyp.patch

diff --git a/packages/nodejs-current/node.gyp.patch b/packages/nodejs-current/node.gyp.patch
index a1a7ab0b..1e9e2ae1 100644
--- a/packages/nodejs-current/node.gyp.patch
+++ b/packages/nodejs-current/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v8.1.0/node.gyp ./node.gyp
---- ../node-v8.1.0/node.gyp	2017-06-08 12:31:34.000000000 +0200
-+++ ./node.gyp	2017-06-12 12:13:40.219057425 +0200
-@@ -557,156 +557,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-v8.1.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-v8.1.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-v8.1.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',
 -              }],
 -            ]}
 -          ]
@@ -64,91 +66,124 @@ diff -u -r ../node-v8.1.0/node.gyp ./node.gyp
 -        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
 -      ],
 -
+-      '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_environment.cc',
+-        'test/cctest/test_util.cc',
+-        'test/cctest/test_url.cc'
+-      ],
+-
 -      'libraries': [
--        '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
--        '<(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)',
+-        '<(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_PATH)<(OBJ_SEPARATOR)node_revert.<(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)',
--      ],
--
--      'defines': [
--        # gtest's ASSERT macros conflict with our own.
--        'GTEST_DONT_DEFINE_ASSERT_EQ=1',
--        'GTEST_DONT_DEFINE_ASSERT_GE=1',
--        'GTEST_DONT_DEFINE_ASSERT_GT=1',
--        'GTEST_DONT_DEFINE_ASSERT_LE=1',
--        'GTEST_DONT_DEFINE_ASSERT_LT=1',
--        'GTEST_DONT_DEFINE_ASSERT_NE=1',
--        'NODE_WANT_INTERNALS=1',
--      ],
--
--      'sources': [
--        'test/cctest/test_base64.cc',
--        'test/cctest/test_environment.cc',
--        'test/cctest/test_util.cc',
--        'test/cctest/test_url.cc'
--      ],
--
--      'sources!': [
--        'src/node_main.cc'
+-        '<(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_shared_zlib=="false"', {
--              'dependencies': [
--                'deps/zlib/zlib.gyp:zlib',
--              ]
+-            ['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)',
+-              ],
 -            }],
--            [ 'node_shared_openssl=="false" and node_shared=="false"', {
--              'dependencies': [
--                'deps/openssl/openssl.gyp:openssl'
+-          ],
+-          '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)',
 -              ]
 -            }],
--            [ 'node_shared_http_parser=="false"', {
--              'dependencies': [
--                'deps/http_parser/http_parser.gyp:http_parser'
+-            ['OS=="linux"', {
+-              'libraries': [
+-                '<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
+-                  'node_dtrace_provider.<(OBJ_SUFFIX)',
 -              ]
 -            }],
--            [ '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_use_v8_platform=="true"', {
--          'dependencies': [
--            'deps/v8/src/v8.gyp:v8_libplatform',
+-        [ 'OS=="win" and node_target_type!="static_library"', {
+-          'libraries': [
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(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)',
--            ]},
+-        }, {
+-          'conditions': [
+-            ['node_target_type!="static_library"', {
+-              'libraries': [
+-                '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
+-              ],
+-            }],
 -          ],
 -        }],
 -        ['OS=="solaris"', {