238 lines
6.1 KiB
Diff
238 lines
6.1 KiB
Diff
diff '--color=auto' -uNr node-v17.8.0.orig/node.gyp node-v17.8.0/node.gyp
|
|
--- node-v17.8.0.orig/node.gyp 2022-03-26 22:11:04.155459285 +0530
|
|
+++ node-v17.8.0/node.gyp 2022-03-26 22:12:22.275459256 +0530
|
|
@@ -436,6 +436,7 @@
|
|
|
|
'include_dirs': [
|
|
'src',
|
|
+ 'deps/cares/src/lib',
|
|
'<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
|
|
],
|
|
'dependencies': [
|
|
@@ -1158,162 +1159,6 @@
|
|
}],
|
|
],
|
|
}, # fuzz_env
|
|
- {
|
|
- 'target_name': 'cctest',
|
|
- 'type': 'executable',
|
|
-
|
|
- 'dependencies': [
|
|
- '<(node_lib_target_name)',
|
|
- 'deps/googletest/googletest.gyp:gtest',
|
|
- 'deps/googletest/googletest.gyp:gtest_main',
|
|
- 'deps/histogram/histogram.gyp:histogram',
|
|
- 'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
- 'node_dtrace_header',
|
|
- 'node_dtrace_ustack',
|
|
- 'node_dtrace_provider',
|
|
- ],
|
|
-
|
|
- 'includes': [
|
|
- 'node.gypi'
|
|
- ],
|
|
-
|
|
- 'include_dirs': [
|
|
- 'src',
|
|
- 'tools/msvs/genfiles',
|
|
- 'deps/v8/include',
|
|
- 'deps/cares/include',
|
|
- 'deps/uv/include',
|
|
- 'deps/uvwasi/include',
|
|
- 'test/cctest',
|
|
- ],
|
|
-
|
|
- 'defines': [
|
|
- 'NODE_ARCH="<(target_arch)"',
|
|
- 'NODE_PLATFORM="<(OS)"',
|
|
- 'NODE_WANT_INTERNALS=1',
|
|
- ],
|
|
-
|
|
- 'sources': [
|
|
- 'src/node_snapshot_stub.cc',
|
|
- 'src/node_code_cache_stub.cc',
|
|
- 'test/cctest/node_test_fixture.cc',
|
|
- 'test/cctest/node_test_fixture.h',
|
|
- 'test/cctest/test_aliased_buffer.cc',
|
|
- 'test/cctest/test_base64.cc',
|
|
- 'test/cctest/test_base_object_ptr.cc',
|
|
- 'test/cctest/test_node_postmortem_metadata.cc',
|
|
- 'test/cctest/test_environment.cc',
|
|
- 'test/cctest/test_js_native_api_v8.cc',
|
|
- 'test/cctest/test_linked_binding.cc',
|
|
- 'test/cctest/test_node_api.cc',
|
|
- 'test/cctest/test_per_process.cc',
|
|
- 'test/cctest/test_platform.cc',
|
|
- 'test/cctest/test_json_utils.cc',
|
|
- 'test/cctest/test_sockaddr.cc',
|
|
- 'test/cctest/test_traced_value.cc',
|
|
- 'test/cctest/test_util.cc',
|
|
- 'test/cctest/test_url.cc',
|
|
- ],
|
|
-
|
|
- 'conditions': [
|
|
- [ 'node_use_openssl=="true"', {
|
|
- 'defines': [
|
|
- 'HAVE_OPENSSL=1',
|
|
- ],
|
|
- 'sources': [
|
|
- 'test/cctest/test_node_crypto.cc',
|
|
- ]
|
|
- }],
|
|
- ['v8_enable_inspector==1', {
|
|
- 'sources': [
|
|
- 'test/cctest/test_inspector_socket.cc',
|
|
- 'test/cctest/test_inspector_socket_server.cc'
|
|
- ],
|
|
- 'defines': [
|
|
- 'HAVE_INSPECTOR=1',
|
|
- ],
|
|
- }, {
|
|
- 'defines': [
|
|
- 'HAVE_INSPECTOR=0',
|
|
- ]
|
|
- }],
|
|
- ['OS=="solaris"', {
|
|
- 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
|
|
- }],
|
|
- # Skip cctest while building shared lib node for Windows
|
|
- [ 'OS=="win" and node_shared=="true"', {
|
|
- 'type': 'none',
|
|
- }],
|
|
- [ 'node_shared=="true"', {
|
|
- 'xcode_settings': {
|
|
- 'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
|
|
- },
|
|
- }],
|
|
- ['OS=="win"', {
|
|
- 'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
- ],
|
|
- }],
|
|
- ],
|
|
- }, # cctest
|
|
-
|
|
- {
|
|
- 'target_name': 'embedtest',
|
|
- 'type': 'executable',
|
|
-
|
|
- 'dependencies': [
|
|
- '<(node_lib_target_name)',
|
|
- 'deps/histogram/histogram.gyp:histogram',
|
|
- 'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
- 'node_dtrace_header',
|
|
- 'node_dtrace_ustack',
|
|
- 'node_dtrace_provider',
|
|
- ],
|
|
-
|
|
- 'includes': [
|
|
- 'node.gypi'
|
|
- ],
|
|
-
|
|
- 'include_dirs': [
|
|
- 'src',
|
|
- 'tools/msvs/genfiles',
|
|
- 'deps/v8/include',
|
|
- 'deps/cares/include',
|
|
- 'deps/uv/include',
|
|
- 'deps/uvwasi/include',
|
|
- 'test/embedding',
|
|
- ],
|
|
-
|
|
- 'sources': [
|
|
- 'src/node_snapshot_stub.cc',
|
|
- 'src/node_code_cache_stub.cc',
|
|
- 'test/embedding/embedtest.cc',
|
|
- ],
|
|
-
|
|
- 'conditions': [
|
|
- ['OS=="solaris"', {
|
|
- 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
|
|
- }],
|
|
- # Skip cctest while building shared lib node for Windows
|
|
- [ 'OS=="win" and node_shared=="true"', {
|
|
- 'type': 'none',
|
|
- }],
|
|
- [ 'node_shared=="true"', {
|
|
- 'xcode_settings': {
|
|
- 'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
|
|
- },
|
|
- }],
|
|
- ['OS=="win"', {
|
|
- 'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
- ],
|
|
- }],
|
|
- ],
|
|
- }, # embedtest
|
|
|
|
{
|
|
'target_name': 'overlapped-checker',
|
|
@@ -1392,59 +1237,13 @@
|
|
'Ws2_32.lib',
|
|
],
|
|
}],
|
|
- ],
|
|
- }, # mkcodecache
|
|
- {
|
|
- 'target_name': 'node_mksnapshot',
|
|
- 'type': 'executable',
|
|
-
|
|
- 'dependencies': [
|
|
- '<(node_lib_target_name)',
|
|
- 'deps/histogram/histogram.gyp:histogram',
|
|
- 'deps/uvwasi/uvwasi.gyp:uvwasi',
|
|
- ],
|
|
-
|
|
- 'includes': [
|
|
- 'node.gypi'
|
|
- ],
|
|
-
|
|
- 'include_dirs': [
|
|
- 'src',
|
|
- 'tools/msvs/genfiles',
|
|
- 'deps/v8/include',
|
|
- 'deps/cares/include',
|
|
- 'deps/uv/include',
|
|
- 'deps/uvwasi/include',
|
|
- ],
|
|
-
|
|
- 'defines': [ 'NODE_WANT_INTERNALS=1' ],
|
|
-
|
|
- 'sources': [
|
|
- 'src/node_snapshot_stub.cc',
|
|
- 'src/node_code_cache_stub.cc',
|
|
- 'tools/snapshot/node_mksnapshot.cc',
|
|
- ],
|
|
-
|
|
- 'conditions': [
|
|
- [ 'node_use_openssl=="true"', {
|
|
- 'defines': [
|
|
- 'HAVE_OPENSSL=1',
|
|
- ],
|
|
- }],
|
|
- ['v8_enable_inspector==1', {
|
|
- 'defines': [
|
|
- 'HAVE_INSPECTOR=1',
|
|
- ],
|
|
- }],
|
|
- ['OS=="win"', {
|
|
+ ['target_arch=="ia32"', {
|
|
'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
+ '-latomic',
|
|
],
|
|
}],
|
|
],
|
|
- }, # node_mksnapshot
|
|
+ }, # mkcodecache
|
|
], # end targets
|
|
|
|
'conditions': [
|