X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/blobdiff_plain/0906fedf61171ece35186a97c923b15bf862d4f3..1c9f53a5cdb79e70ad313e0812c0c7fe2bc2c55e:/packages/nodejs-current/node.gyp.patch diff --git a/packages/nodejs-current/node.gyp.patch b/packages/nodejs-current/node.gyp.patch index 27868ae6..43dc4031 100644 --- 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.7.1/node.gyp ./node.gyp +--- ../node-v9.7.1/node.gyp 2018-03-02 01:58:17.000000000 +0000 ++++ ./node.gyp 2018-03-05 10:52:38.637165269 +0000 +@@ -901,70 +901,6 @@ ], } ], ] @@ -11,7 +11,8 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp - 'type': 'executable', - - 'dependencies': [ -- '<(node_core_target_name)', +- '<(node_lib_target_name)', +- 'rename_node_bin_win', - 'deps/gtest/gtest.gyp:gtest', - 'node_js2c#host', - 'node_dtrace_header', @@ -19,38 +20,6 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp - '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', -- '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.', -- }, { -- 'conditions': [ -- ['OS=="win"', { -- 'OBJ_PATH': '<(OBJ_DIR)/node', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node', -- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node', -- }], -- ['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' - ], @@ -67,160 +36,39 @@ diff -u -r ../node-v9.3.0/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', +- 'test/cctest/test_node_postmortem_metadata.cc', - 'test/cctest/test_environment.cc', - 'test/cctest/test_util.cc', - 'test/cctest/test_url.cc' - ], - -- 'sources!': [ -- 'src/node_main.cc' -- ], -- - '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)', -- ], - 'defines': [ - 'HAVE_OPENSSL=1', - ], - }], +- [ 'node_use_perfctr=="true"', { +- 'defines': [ 'HAVE_PERFCTR=1' ], +- }], - ['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)', -- ], - 'defines': [ - 'HAVE_INSPECTOR=1', - ], -- }], -- [ 'node_use_dtrace=="true"', { -- '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)/node_dtrace_provider.o', -- ] -- }], -- ], -- }], -- [ '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' -- ] -- }], -- [ 'node_shared_nghttp2=="false"', { -- 'dependencies': [ -- 'deps/nghttp2/nghttp2.gyp:nghttp2' -- ], -- 'include_dirs': [ -- 'deps/nghttp2/lib/includes' -- ] -- }], -- [ 'node_use_v8_platform=="true"', { -- 'dependencies': [ -- 'deps/v8/src/v8.gyp:v8_libplatform', -- ], +- 'defines': [ 'HAVE_INSPECTOR=0' ] - }], - ['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