Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

build: conditionally compile bundled sqlite

Browse Source 
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 unconditional entries in `node.gyp`
are not necessary.

PR-URL: https://github.com/nodejs/node/pull/55409
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
This commit is contained in:
Richard Lau 2024-10-21 17:57:14 +01:00 committed by GitHub
parent 4d51c60ade
commit e92446536e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
node.gyp
View File

@ -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' ],