From 78bd0abda377a869219c635f711459092cde1037 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 16 Nov 2024 19:10:58 +0100 Subject: [PATCH 1/3] build: compile bundled ada conditionally The --shared-ada flag was introduced in #52924, but the implementation was incomplete. Resolves #52914 --- node.gyp | 5 ----- node.gypi | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/node.gyp b/node.gyp index 5b5b2b7c1c9627..6235559fcec781 100644 --- a/node.gyp +++ b/node.gyp @@ -851,7 +851,6 @@ 'deps/histogram/histogram.gyp:histogram', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', 'node_js2c#host', ], @@ -1125,7 +1124,6 @@ 'deps/googletest/googletest.gyp:gtest_prod', 'deps/histogram/histogram.gyp:histogram', 'deps/uvwasi/uvwasi.gyp:uvwasi', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], 'includes': [ @@ -1174,7 +1172,6 @@ 'deps/histogram/histogram.gyp:histogram', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1252,7 +1249,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1366,7 +1362,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', diff --git a/node.gypi b/node.gypi index 9c989022a9ad36..3646945241c0d9 100644 --- a/node.gypi +++ b/node.gypi @@ -212,6 +212,10 @@ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ], }], + [ 'node_shared_ada=="false"', { + 'dependencies': [ 'deps/ada/ada.gyp:ada' ], + }], + [ 'node_shared_brotli=="false"', { 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], }], From 077b5536e8cf85572576a3a6189d336fce02c96f Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 16 Nov 2024 19:13:46 +0100 Subject: [PATCH 2/3] build: compile bundled simdjson conditionally The --shared-simdjson flag was introduced in #52924, but the implementation was incomplete. Resolves #52914 --- node.gyp | 3 --- node.gypi | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/node.gyp b/node.gyp index 6235559fcec781..1b07270b578268 100644 --- a/node.gyp +++ b/node.gyp @@ -849,7 +849,6 @@ 'dependencies': [ 'deps/googletest/googletest.gyp:gtest_prod', 'deps/histogram/histogram.gyp:histogram', - 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', 'deps/nbytes/nbytes.gyp:nbytes', 'node_js2c#host', @@ -1170,7 +1169,6 @@ 'deps/googletest/googletest.gyp:gtest', 'deps/googletest/googletest.gyp:gtest_main', 'deps/histogram/histogram.gyp:histogram', - 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1363,7 +1361,6 @@ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', 'deps/nbytes/nbytes.gyp:nbytes', - 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', ], diff --git a/node.gypi b/node.gypi index 3646945241c0d9..63710d07f552a1 100644 --- a/node.gypi +++ b/node.gypi @@ -216,6 +216,10 @@ 'dependencies': [ 'deps/ada/ada.gyp:ada' ], }], + [ 'node_shared_simdjson=="false"', { + 'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ], + }], + [ 'node_shared_brotli=="false"', { 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], }], From 4a035b31a6813593cd9711a28f012c575c639d2f Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 16 Nov 2024 19:17:17 +0100 Subject: [PATCH 3/3] build: compile bundled simdutf conditionally The --shared-simdutf flag was introduced in #52924, but the implementation was incomplete. Resolves #52914 --- node.gyp | 9 +++------ node.gypi | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/node.gyp b/node.gyp index 1b07270b578268..ae21978922985c 100644 --- a/node.gyp +++ b/node.gyp @@ -849,7 +849,6 @@ 'dependencies': [ 'deps/googletest/googletest.gyp:gtest_prod', 'deps/histogram/histogram.gyp:histogram', - 'deps/simdutf/simdutf.gyp:simdutf', 'deps/nbytes/nbytes.gyp:nbytes', 'node_js2c#host', ], @@ -1169,7 +1168,6 @@ 'deps/googletest/googletest.gyp:gtest', 'deps/googletest/googletest.gyp:gtest_main', 'deps/histogram/histogram.gyp:histogram', - 'deps/simdutf/simdutf.gyp:simdutf', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1321,9 +1319,6 @@ 'target_name': 'node_js2c', 'type': 'executable', 'toolsets': ['host'], - 'dependencies': [ - 'deps/simdutf/simdutf.gyp:simdutf#host', - ], 'include_dirs': [ 'tools', 'src', @@ -1335,6 +1330,9 @@ 'src/embedded_data.cc', ], 'conditions': [ + [ 'node_shared_simdutf=="false"', { + 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ], + }], [ 'node_shared_libuv=="false"', { 'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ], }], @@ -1361,7 +1359,6 @@ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', 'deps/nbytes/nbytes.gyp:nbytes', - 'deps/simdutf/simdutf.gyp:simdutf', ], 'includes': [ diff --git a/node.gypi b/node.gypi index 63710d07f552a1..c61e9b170a05c9 100644 --- a/node.gypi +++ b/node.gypi @@ -220,6 +220,10 @@ 'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ], }], + [ 'node_shared_simdutf=="false"', { + 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ], + }], + [ 'node_shared_brotli=="false"', { 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], }],