@@ -24,7 +24,7 @@ index 2415940835036226799a7ea14c6687cc0d56c523..0feb07afbccad97a92cee00954443407
2424 o['variables']['v8_enable_external_code_space'] = 1 if options.enable_pointer_compression else 0
2525 o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0
2626diff --git a/node.gni b/node.gni
27- index b049f0692980c3e26771c3209c3bdd2e9a4d637b ..e2407027ab05e59b2f0f1c213b98ea469db7a91b 100644
27+ index d4438f7fd61598afac2c1e3184721a759d22b10c ..e2407027ab05e59b2f0f1c213b98ea469db7a91b 100644
2828--- a/node.gni
2929+++ b/node.gni
3030@@ -5,10 +5,10 @@
@@ -40,15 +40,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
4040
4141 # The location of OpenSSL - use the one from node's deps by default.
4242 node_openssl_path = "$node_path/deps/openssl"
43- @@ -42,12 +42,15 @@ declare_args() {
44- # The variable is called "openssl" for parity with node's GYP build.
45- node_use_openssl = true
46-
47- + # Build node with SQLite support.
48- + node_use_sqlite = true
49- +
50- # Use the specified path to system CA (PEM format) in addition to
51- # the BoringSSL supplied CA store or compiled-in Mozilla CA copy.
43+ @@ -50,7 +50,7 @@ declare_args() {
5244 node_openssl_system_ca_path = ""
5345
5446 # Initialize v8 platform during node.js startup.
@@ -57,7 +49,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
5749
5850 # Custom build tag.
5951 node_tag = ""
60- @@ -67 ,10 +70,16 @@ declare_args() {
52+ @@ -70 ,10 +70,16 @@ declare_args() {
6153 # TODO(zcbenz): There are few broken things for now:
6254 # 1. cross-os compilation is not supported.
6355 # 2. node_mksnapshot crashes when cross-compiling for x64 from arm64.
@@ -76,7 +68,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
7668
7769 assert(!node_enable_inspector || node_use_openssl,
7870diff --git a/src/node_builtins.cc b/src/node_builtins.cc
79- index abf1583cdac9f139056cf4809f14e28e62f6d24c..8b104e175ccf8de90c138337f83f8f6ce1348ac7 100644
71+ index b4acc40618e372b09d0cb5e3755034f08711a282..efeaaef7e4dc64a0adb5e6bdbbe18945890de62c 100644
8072--- a/src/node_builtins.cc
8173+++ b/src/node_builtins.cc
8274@@ -789,6 +789,7 @@ void BuiltinLoader::RegisterExternalReferences(
@@ -279,22 +271,10 @@ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd1
279271 if sys.platform == 'win32':
280272 files = [ x.replace('\\', '/') for x in files ]
281273diff --git a/unofficial.gni b/unofficial.gni
282- index da565473f1ae96b4d009935f7733e6ab15ea9de2 ..26ebc811272ef2990f8d090c54e7f5294aab9d37 100644
274+ index 865a0d5ce9c6792e57f4216bcaa594ca6fc7b1c8 ..26ebc811272ef2990f8d090c54e7f5294aab9d37 100644
283275--- a/unofficial.gni
284276+++ b/unofficial.gni
285- @@ -22,6 +22,11 @@ template("node_gn_build") {
286- } else {
287- defines += [ "HAVE_OPENSSL=0" ]
288- }
289- + if (node_use_sqlite) {
290- + defines += [ "HAVE_SQLITE=1" ]
291- + } else {
292- + defines += [ "HAVE_SQLITE=0" ]
293- + }
294- if (node_use_amaro) {
295- defines += [ "HAVE_AMARO=1" ]
296- } else {
297- @@ -142,32 +147,41 @@ template("node_gn_build") {
277+ @@ -147,31 +147,41 @@ template("node_gn_build") {
298278 public_configs = [
299279 ":node_external_config",
300280 "deps/googletest:googletest_config",
@@ -317,7 +297,6 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
317297 "deps/nghttp2",
318298- "deps/ngtcp2",
319299 "deps/postject",
320- - "deps/sqlite",
321300 "deps/uvwasi",
322301- "deps/zstd",
323302 "//third_party/zlib",
@@ -340,22 +319,16 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
340319 "$target_gen_dir/node_javascript.cc",
341320 ] + gypi_values.node_sources
342321
343- @@ -190,9 +204,13 @@ template("node_gn_build") {
322+ @@ -194,7 +204,7 @@ template("node_gn_build") {
344323 }
345324 if (node_use_openssl) {
346325 deps += [ "deps/ncrypto" ]
347326- public_deps += [ "$node_openssl_path" ]
348327+ public_deps += [ "//third_party/boringssl" ]
349328 sources += gypi_values.node_crypto_sources
350329 }
351- + if (node_use_sqlite) {
352- + deps += [ "deps/sqlite" ]
353- + sources += gypi_values.node_sqlite_sources
354- + }
355- if (node_enable_inspector) {
356- deps += [
357- "$node_inspector_protocol_path:crdtp",
358- @@ -215,6 +233,10 @@ template("node_gn_build") {
330+ if (node_use_sqlite) {
331+ @@ -223,6 +233,10 @@ template("node_gn_build") {
359332 }
360333 }
361334
@@ -366,15 +339,15 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
366339 executable(target_name) {
367340 forward_variables_from(invoker, "*")
368341
369- @@ -289 ,6 +311,7 @@ template("node_gn_build") {
342+ @@ -297 ,6 +311,7 @@ template("node_gn_build") {
370343 }
371344
372345 executable("node_js2c") {
373346+ defines = []
374347 deps = [
375348 "deps/uv",
376349 "$node_simdutf_path",
377- @@ -299 ,26 +322,75 @@ template("node_gn_build") {
350+ @@ -307 ,26 +322,75 @@ template("node_gn_build") {
378351 "src/embedded_data.cc",
379352 "src/embedded_data.h",
380353 ]
@@ -460,7 +433,7 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
460433 outputs = [ "$target_gen_dir/node_javascript.cc" ]
461434
462435 # Get the path to node_js2c executable of the host toolchain.
463- @@ -332 ,11 +404,11 @@ template("node_gn_build") {
436+ @@ -340 ,11 +404,11 @@ template("node_gn_build") {
464437 get_label_info(":node_js2c($host_toolchain)", "name") +
465438 host_executable_suffix
466439
0 commit comments