-diff -u -r ../node-v6.11.2/node.gyp ./node.gyp
---- ../node-v6.11.2/node.gyp 2017-08-01 05:39:14.000000000 +0000
-+++ ./node.gyp 2017-08-08 08:52:59.805556714 +0000
-@@ -531,123 +531,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 @@
],
} ],
]
- '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_PATH': '<(OBJ_DIR)/node',
-- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
- 'OBJ_SUFFIX': 'obj',
- }],
-- ['OS=="aix"', {
-- 'OBJ_PATH': '<(OBJ_DIR)/node_base/src',
-- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen',
-- }],
-- ],
+- ['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': [
- '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
- ],
-
-- 'libraries': [
-- '<(OBJ_GEN_PATH)/node_javascript.<(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)',
-- ],
--
-- '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',
-- ],
+- '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'
- ],
-
- 'sources!': [
- ],
-
- 'conditions': [
-- ['v8_inspector=="true"', {
+- ['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"', {
+- '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',
+- ],
+- }],
+- ['v8_enable_inspector==1', {
- 'sources': [
- 'test/cctest/test_inspector_socket.cc',
+- 'test/cctest/test_inspector_socket_server.cc'
- ],
- 'conditions': [
-- [ 'node_shared_openssl=="false" and node_shared=="false"', {
-- 'dependencies': [
-- 'deps/openssl/openssl.gyp:openssl'
-- ]
+- ['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_http_parser=="false"', {
-- 'dependencies': [
-- 'deps/http_parser/http_parser.gyp:http_parser'
+- ],
+- '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_libuv=="false"', {
-- 'dependencies': [
-- 'deps/uv/uv.gyp:libuv'
+- ['OS=="linux"', {
+- 'libraries': [
+- '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
- ]
-- }]
+- }],
+- ],
+- }],
+- [ 'OS=="win" and node_target_type!="static_library"', {
+- 'libraries': [
+- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
+- ],
+- }, {
+- 'conditions': [
+- ['node_target_type!="static_library"', {
+- '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_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)',
-- ]},
+- [ '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',
- ],
- }],
- ['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
~mdw / termux-packages / blobdiff