129 lines
3.7 KiB
Diff
129 lines
3.7 KiB
Diff
|
From fb3c0082f561d3e656b1b73c6176a04bc203cacb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Richard Lau <rlau@redhat.com>
|
||
|
|
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 unconditional entries in `node.gyp`
|
||
|
|
are not necessary.
|
||
|
|
|
||
|
|
Signed-off-by: rpm-build <rpm-build>
|
||
|
|
---
|
||
|
|
node.gyp | 13 -------------
|
||
|
|
1 file changed, 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/node.gyp b/node.gyp
|
||
|
|
index da6ea50..9f24b1c 100644
|
||
|
|
--- a/node.gyp
|
||
|
|
+++ b/node.gyp
|
||
|
|
@@ -840,7 +840,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',
|
||
|
|
@@ -1030,7 +1029,6 @@
|
||
|
|
'dependencies': [
|
||
|
|
'<(node_lib_target_name)',
|
||
|
|
'deps/histogram/histogram.gyp:histogram',
|
||
|
|
- 'deps/sqlite/sqlite.gyp:sqlite',
|
||
|
|
],
|
||
|
|
|
||
|
|
'includes': [
|
||
|
|
@@ -1042,7 +1040,6 @@
|
||
|
|
'deps/v8/include',
|
||
|
|
'deps/cares/include',
|
||
|
|
'deps/uv/include',
|
||
|
|
- 'deps/sqlite',
|
||
|
|
'test/cctest',
|
||
|
|
],
|
||
|
|
|
||
|
|
@@ -1075,7 +1072,6 @@
|
||
|
|
'dependencies': [
|
||
|
|
'<(node_lib_target_name)',
|
||
|
|
'deps/histogram/histogram.gyp:histogram',
|
||
|
|
- 'deps/sqlite/sqlite.gyp:sqlite',
|
||
|
|
'deps/uvwasi/uvwasi.gyp:uvwasi',
|
||
|
|
],
|
||
|
|
'includes': [
|
||
|
|
@@ -1086,7 +1082,6 @@
|
||
|
|
'tools/msvs/genfiles',
|
||
|
|
'deps/v8/include',
|
||
|
|
'deps/cares/include',
|
||
|
|
- 'deps/sqlite',
|
||
|
|
'deps/uv/include',
|
||
|
|
'deps/uvwasi/include',
|
||
|
|
'test/cctest',
|
||
|
|
@@ -1121,7 +1116,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',
|
||
|
|
@@ -1134,7 +1128,6 @@
|
||
|
|
'tools/msvs/genfiles',
|
||
|
|
'deps/v8/include',
|
||
|
|
'deps/cares/include',
|
||
|
|
- 'deps/sqlite',
|
||
|
|
'deps/uv/include',
|
||
|
|
'deps/uvwasi/include',
|
||
|
|
'test/cctest',
|
||
|
|
@@ -1171,7 +1164,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',
|
||
|
|
@@ -1188,7 +1180,6 @@
|
||
|
|
'deps/v8/include',
|
||
|
|
'deps/cares/include',
|
||
|
|
'deps/uv/include',
|
||
|
|
- 'deps/sqlite',
|
||
|
|
'test/cctest',
|
||
|
|
],
|
||
|
|
|
||
|
|
@@ -1253,7 +1244,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',
|
||
|
|
],
|
||
|
|
@@ -1269,7 +1259,6 @@
|
||
|
|
'deps/v8/include',
|
||
|
|
'deps/cares/include',
|
||
|
|
'deps/uv/include',
|
||
|
|
- 'deps/sqlite',
|
||
|
|
'test/embedding',
|
||
|
|
],
|
||
|
|
|
||
|
|
@@ -1369,7 +1358,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',
|
||
|
|
@@ -1386,7 +1374,6 @@
|
||
|
|
'deps/v8/include',
|
||
|
|
'deps/cares/include',
|
||
|
|
'deps/uv/include',
|
||
|
|
- 'deps/sqlite',
|
||
|
|
],
|
||
|
|
|
||
|
|
'defines': [ 'NODE_WANT_INTERNALS=1' ],
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|