daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 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>
pull/56040/head
Richard Lau 2024-10-21 17:57:14 +01:00 committed by Ruy Adorno
parent 41a2bcd335
commit edbbd4a374
No known key found for this signature in database
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

@ -857,7 +857,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',
@ -1047,7 +1046,6 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'deps/sqlite/sqlite.gyp:sqlite',
],
'includes': [
@ -1059,7 +1057,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
'test/cctest',
],
@ -1092,7 +1089,6 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'deps/sqlite/sqlite.gyp:sqlite',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],
'includes': [
@ -1103,7 +1099,6 @@
'tools/msvs/genfiles',
'deps/v8/include',
'deps/cares/include',
'deps/sqlite',
'deps/uv/include',
'deps/uvwasi/include',
'test/cctest',
@ -1138,7 +1133,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',
@ -1151,7 +1145,6 @@
'tools/msvs/genfiles',
'deps/v8/include',
'deps/cares/include',
'deps/sqlite',
'deps/uv/include',
'deps/uvwasi/include',
'test/cctest',
@ -1188,7 +1181,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',
@ -1205,7 +1197,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
'test/cctest',
],
@ -1270,7 +1261,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',
],
@ -1286,7 +1276,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
'test/embedding',
],
@ -1386,7 +1375,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',
@ -1403,7 +1391,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
],
'defines': [ 'NODE_WANT_INTERNALS=1' ],