Skip to content

Commit

Permalink
build: conditionally compile bundled sqlite
Browse files Browse the repository at this point in the history
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: #55409
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
richardlau authored and ruyadorno committed Nov 27, 2024
1 parent 41a2bcd commit edbbd4a
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -1047,7 +1046,6 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'deps/sqlite/sqlite.gyp:sqlite',
],

'includes': [
Expand All @@ -1059,7 +1057,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
'test/cctest',
],

Expand Down Expand Up @@ -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': [
Expand All @@ -1103,7 +1099,6 @@
'tools/msvs/genfiles',
'deps/v8/include',
'deps/cares/include',
'deps/sqlite',
'deps/uv/include',
'deps/uvwasi/include',
'test/cctest',
Expand Down Expand Up @@ -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',
Expand All @@ -1151,7 +1145,6 @@
'tools/msvs/genfiles',
'deps/v8/include',
'deps/cares/include',
'deps/sqlite',
'deps/uv/include',
'deps/uvwasi/include',
'test/cctest',
Expand Down Expand Up @@ -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',
Expand All @@ -1205,7 +1197,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
'test/cctest',
],

Expand Down Expand Up @@ -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',
],
Expand All @@ -1286,7 +1276,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
'test/embedding',
],

Expand Down Expand Up @@ -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',
Expand All @@ -1403,7 +1391,6 @@
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
'deps/sqlite',
],

'defines': [ 'NODE_WANT_INTERNALS=1' ],
Expand Down

0 comments on commit edbbd4a

Please sign in to comment.