X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/be5f26564d080f87e5d4c8956c16cd93f3bfcb32..475126a87ff8b55c0074c0777e7b4ef15035f56b:/packages/nodejs/node.gyp.patch

diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch
index 9537a2f3..6929a46c 100644
--- a/packages/nodejs/node.gyp.patch
+++ b/packages/nodejs/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v8.9.4/node.gyp ./node.gyp
---- ../node-v8.9.4/node.gyp	2018-01-03 02:35:08.000000000 +0000
-+++ ./node.gyp	2018-01-21 19:57:04.965201176 +0000
-@@ -736,221 +736,6 @@
+diff -u -r ../node-v8.10.0/node.gyp ./node.gyp
+--- ../node-v8.10.0/node.gyp	2018-03-06 22:56:00.000000000 +0000
++++ ./node.gyp	2018-03-09 09:56:48.529279637 +0000
+@@ -749,234 +749,6 @@
            ],
          } ],
        ]
@@ -67,6 +67,7 @@ diff -u -r ../node-v8.9.4/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-v8.9.4/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)',
@@ -104,11 +105,15 @@ diff -u -r ../node-v8.9.4/node.gyp ./node.gyp
 -          ],
 -        }],
 -        [ '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',
@@ -119,18 +124,22 @@ diff -u -r ../node-v8.9.4/node.gyp ./node.gyp
 -            '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)',
 -          ],
@@ -148,14 +157,18 @@ diff -u -r ../node-v8.9.4/node.gyp ./node.gyp
 -            }],
 -          ],
 -        }],
--        [ 'OS=="win"', {
+-        [ 'OS=="win" and node_target_type!="static_library"', {
 -          'libraries': [
 -            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
--           ],
+-          ],
 -        }, {
--          'libraries': [
--            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
--           ],
+-          'conditions': [
+-            ['node_target_type!="static_library"', {
+-              'libraries': [
+-                '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
+-              ],
+-            }],
+-          ],
 -        }],
 -        [ 'node_shared_zlib=="false"', {
 -          'dependencies': [