X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a61e7e45560cd92657ba15a752a5dad49875fd23..8a478d7e1ad5cec030ae8a69a8730ec38389bb5c:/disabled-packages/nodejs-current/node.gyp.patch

diff --git a/disabled-packages/nodejs-current/node.gyp.patch b/disabled-packages/nodejs-current/node.gyp.patch
index d18d8a2f..8a9d46c2 100644
--- a/disabled-packages/nodejs-current/node.gyp.patch
+++ b/disabled-packages/nodejs-current/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v7.4.0/node.gyp ./node.gyp
---- ../node-v7.4.0/node.gyp	2017-01-04 12:42:03.000000000 -0500
-+++ ./node.gyp	2017-01-09 17:25:27.918417691 -0500
-@@ -863,78 +863,6 @@
+diff -u -r ../node-v7.10.0/node.gyp ./node.gyp
+--- ../node-v7.10.0/node.gyp	2017-05-03 04:00:10.000000000 +0200
++++ ./node.gyp	2017-05-08 10:53:47.305406639 +0200
+@@ -556,141 +556,6 @@
            ],
          } ],
        ]
@@ -9,12 +9,70 @@ diff -u -r ../node-v7.4.0/node.gyp ./node.gyp
 -    {
 -      'target_name': 'cctest',
 -      'type': 'executable',
--      'dependencies': [ 'deps/gtest/gtest.gyp:gtest' ],
+-
+-      'dependencies': [
+-        '<(node_core_target_name)',
+-        'deps/gtest/gtest.gyp:gtest',
+-        'node_js2c#host',
+-        'node_dtrace_header',
+-        'node_dtrace_ustack',
+-        'node_dtrace_provider',
+-      ],
+-
+-      'variables': {
+-        'OBJ_PATH': '<(OBJ_DIR)/node/src',
+-        'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen',
+-        'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing',
+-        'OBJ_SUFFIX': 'o',
+-        'conditions': [
+-          ['OS=="win"', {
+-            'OBJ_PATH': '<(OBJ_DIR)/node',
+-            'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
+-            'OBJ_TRACING_PATH': '<(OBJ_DIR)/node',
+-            'OBJ_SUFFIX': 'obj',
+-          }],
+-          ['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',
+-          }],
+-         ],
+-       },
+-
+-      'includes': [
+-        'node.gypi'
+-      ],
+-
 -      'include_dirs': [
 -        'src',
+-        'tools/msvs/genfiles',
 -        'deps/v8/include',
--        '<(SHARED_INTERMEDIATE_DIR)'
+-        'deps/cares/include',
+-        'deps/uv/include',
+-        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
 -      ],
+-
+-      'libraries': [
+-        '<(OBJ_GEN_PATH)/node_javascript.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_debug_options.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/async-wrap.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/env.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_buffer.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_i18n.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/debug-agent.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/util.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/string_bytes.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/string_search.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/stream_base.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_constants.<(OBJ_SUFFIX)',
+-        '<(OBJ_PATH)/node_revert.<(OBJ_SUFFIX)',
+-        '<(OBJ_TRACING_PATH)/agent.<(OBJ_SUFFIX)',
+-        '<(OBJ_TRACING_PATH)/node_trace_buffer.<(OBJ_SUFFIX)',
+-        '<(OBJ_TRACING_PATH)/node_trace_writer.<(OBJ_SUFFIX)',
+-        '<(OBJ_TRACING_PATH)/trace_event.<(OBJ_SUFFIX)',
+-      ],
+-
 -      'defines': [
 -        # gtest's ASSERT macros conflict with our own.
 -        'GTEST_DONT_DEFINE_ASSERT_EQ=1',
@@ -25,29 +83,27 @@ diff -u -r ../node-v7.4.0/node.gyp ./node.gyp
 -        'GTEST_DONT_DEFINE_ASSERT_NE=1',
 -        'NODE_WANT_INTERNALS=1',
 -      ],
+-
 -      'sources': [
--        'test/cctest/util.cc',
+-        'test/cctest/test_util.cc',
+-      ],
+-
+-      'sources!': [
+-        'src/node_main.cc'
 -      ],
 -
 -      'conditions': [
 -        ['v8_inspector=="true"', {
--          'defines': [
--            'HAVE_INSPECTOR=1',
--          ],
--          'dependencies': [
--            'deps/zlib/zlib.gyp:zlib',
--            'v8_inspector_compress_protocol_json#host'
--          ],
--          'include_dirs': [
--            '<(SHARED_INTERMEDIATE_DIR)'
--          ],
 -          'sources': [
--            'src/inspector_socket.cc',
--            'src/inspector_socket_server.cc',
 -            '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_shared_openssl=="false"', {
 -              'dependencies': [
 -                'deps/openssl/openssl.gyp:openssl'
@@ -70,12 +126,19 @@ diff -u -r ../node-v7.4.0/node.gyp ./node.gyp
 -            'deps/v8/src/v8.gyp:v8_libplatform',
 -          ],
 -        }],
--        [ 'node_use_bundled_v8=="true"', {
--          'dependencies': [
--            'deps/v8/src/v8.gyp:v8',
--            'deps/v8/src/v8.gyp:v8_libplatform'
+-        [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
+-          'copies': [{
+-            'destination': '<(OBJ_DIR)/cctest/src',
+-            'files': [
+-              '<(OBJ_PATH)/node_dtrace_ustack.<(OBJ_SUFFIX)',
+-              '<(OBJ_PATH)/node_dtrace_provider.<(OBJ_SUFFIX)',
+-              '<(OBJ_PATH)/node_dtrace.<(OBJ_SUFFIX)',
+-            ]},
 -          ],
 -        }],
+-        ['OS=="solaris"', {
+-          'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
+-        }],
 -      ]
      }
    ], # end targets