From b478e48807dad9914ac311f3a25db6ce556ac625 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 16 Oct 2024 17:26:42 +0000 Subject: [PATCH] build: conditionally compile bundled sqlite Only compile the bundled sqlite in `deps/sqlite` if Node.js was not configured with `--shared-sqlite`. `node.gypi` is already correctly adding the sqlite dependency if `node_shared_sqlite=="false"` so the uncoditional entries in `node.gyp` are not necessary. --- node.gyp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/node.gyp b/node.gyp index ac128c95d9c3ed..5b5b2b7c1c9627 100644 --- a/node.gyp +++ b/node.gyp @@ -849,7 +849,6 @@ 'dependencies': [ 'deps/googletest/googletest.gyp:gtest_prod', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', 'deps/ada/ada.gyp:ada', @@ -1038,7 +1037,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', ], 'includes': [ @@ -1050,7 +1048,6 @@ 'deps/v8/include', 'deps/cares/include', 'deps/uv/include', - 'deps/sqlite', 'test/cctest', ], @@ -1083,7 +1080,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', 'deps/uvwasi/uvwasi.gyp:uvwasi', ], 'includes': [ @@ -1094,7 +1090,6 @@ 'tools/msvs/genfiles', 'deps/v8/include', 'deps/cares/include', - 'deps/sqlite', 'deps/uv/include', 'deps/uvwasi/include', 'test/cctest', @@ -1129,7 +1124,6 @@ '<(node_lib_target_name)', 'deps/googletest/googletest.gyp:gtest_prod', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', 'deps/uvwasi/uvwasi.gyp:uvwasi', 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', @@ -1142,7 +1136,6 @@ 'tools/msvs/genfiles', 'deps/v8/include', 'deps/cares/include', - 'deps/sqlite', 'deps/uv/include', 'deps/uvwasi/include', 'test/cctest', @@ -1179,7 +1172,6 @@ 'deps/googletest/googletest.gyp:gtest', 'deps/googletest/googletest.gyp:gtest_main', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', 'deps/ada/ada.gyp:ada', @@ -1196,7 +1188,6 @@ 'deps/v8/include', 'deps/cares/include', 'deps/uv/include', - 'deps/sqlite', 'test/cctest', ], @@ -1261,7 +1252,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1277,7 +1267,6 @@ 'deps/v8/include', 'deps/cares/include', 'deps/uv/include', - 'deps/sqlite', 'test/embedding', ], @@ -1377,7 +1366,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/sqlite/sqlite.gyp:sqlite', 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', 'deps/simdjson/simdjson.gyp:simdjson', @@ -1394,7 +1382,6 @@ 'deps/v8/include', 'deps/cares/include', 'deps/uv/include', - 'deps/sqlite', ], 'defines': [ 'NODE_WANT_INTERNALS=1' ],