@@ -24,7 +24,7 @@ index 2415940835036226799a7ea14c6687cc0d56c523..0feb07afbccad97a92cee00954443407
24
24
o['variables']['v8_enable_external_code_space'] = 1 if options.enable_pointer_compression else 0
25
25
o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0
26
26
diff --git a/node.gni b/node.gni
27
- index b049f0692980c3e26771c3209c3bdd2e9a4d637b ..e2407027ab05e59b2f0f1c213b98ea469db7a91b 100644
27
+ index d4438f7fd61598afac2c1e3184721a759d22b10c ..e2407027ab05e59b2f0f1c213b98ea469db7a91b 100644
28
28
--- a/node.gni
29
29
+++ b/node.gni
30
30
@@ -5,10 +5,10 @@
@@ -40,15 +40,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
40
40
41
41
# The location of OpenSSL - use the one from node's deps by default.
42
42
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() {
52
44
node_openssl_system_ca_path = ""
53
45
54
46
# Initialize v8 platform during node.js startup.
@@ -57,7 +49,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
57
49
58
50
# Custom build tag.
59
51
node_tag = ""
60
- @@ -67 ,10 +70,16 @@ declare_args() {
52
+ @@ -70 ,10 +70,16 @@ declare_args() {
61
53
# TODO(zcbenz): There are few broken things for now:
62
54
# 1. cross-os compilation is not supported.
63
55
# 2. node_mksnapshot crashes when cross-compiling for x64 from arm64.
@@ -76,7 +68,7 @@ index b049f0692980c3e26771c3209c3bdd2e9a4d637b..e2407027ab05e59b2f0f1c213b98ea46
76
68
77
69
assert(!node_enable_inspector || node_use_openssl,
78
70
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
79
- index abf1583cdac9f139056cf4809f14e28e62f6d24c..8b104e175ccf8de90c138337f83f8f6ce1348ac7 100644
71
+ index b4acc40618e372b09d0cb5e3755034f08711a282..efeaaef7e4dc64a0adb5e6bdbbe18945890de62c 100644
80
72
--- a/src/node_builtins.cc
81
73
+++ b/src/node_builtins.cc
82
74
@@ -789,6 +789,7 @@ void BuiltinLoader::RegisterExternalReferences(
@@ -279,22 +271,10 @@ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd1
279
271
if sys.platform == 'win32':
280
272
files = [ x.replace('\\', '/') for x in files ]
281
273
diff --git a/unofficial.gni b/unofficial.gni
282
- index da565473f1ae96b4d009935f7733e6ab15ea9de2 ..26ebc811272ef2990f8d090c54e7f5294aab9d37 100644
274
+ index 865a0d5ce9c6792e57f4216bcaa594ca6fc7b1c8 ..26ebc811272ef2990f8d090c54e7f5294aab9d37 100644
283
275
--- a/unofficial.gni
284
276
+++ 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") {
298
278
public_configs = [
299
279
":node_external_config",
300
280
"deps/googletest:googletest_config",
@@ -317,7 +297,6 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
317
297
"deps/nghttp2",
318
298
- "deps/ngtcp2",
319
299
"deps/postject",
320
- - "deps/sqlite",
321
300
"deps/uvwasi",
322
301
- "deps/zstd",
323
302
"//third_party/zlib",
@@ -340,22 +319,16 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
340
319
"$target_gen_dir/node_javascript.cc",
341
320
] + gypi_values.node_sources
342
321
343
- @@ -190,9 +204,13 @@ template("node_gn_build") {
322
+ @@ -194,7 +204,7 @@ template("node_gn_build") {
344
323
}
345
324
if (node_use_openssl) {
346
325
deps += [ "deps/ncrypto" ]
347
326
- public_deps += [ "$node_openssl_path" ]
348
327
+ public_deps += [ "//third_party/boringssl" ]
349
328
sources += gypi_values.node_crypto_sources
350
329
}
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") {
359
332
}
360
333
}
361
334
@@ -366,15 +339,15 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
366
339
executable(target_name) {
367
340
forward_variables_from(invoker, "*")
368
341
369
- @@ -289 ,6 +311,7 @@ template("node_gn_build") {
342
+ @@ -297 ,6 +311,7 @@ template("node_gn_build") {
370
343
}
371
344
372
345
executable("node_js2c") {
373
346
+ defines = []
374
347
deps = [
375
348
"deps/uv",
376
349
"$node_simdutf_path",
377
- @@ -299 ,26 +322,75 @@ template("node_gn_build") {
350
+ @@ -307 ,26 +322,75 @@ template("node_gn_build") {
378
351
"src/embedded_data.cc",
379
352
"src/embedded_data.h",
380
353
]
@@ -460,7 +433,7 @@ index da565473f1ae96b4d009935f7733e6ab15ea9de2..26ebc811272ef2990f8d090c54e7f529
460
433
outputs = [ "$target_gen_dir/node_javascript.cc" ]
461
434
462
435
# 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") {
464
437
get_label_info(":node_js2c($host_toolchain)", "name") +
465
438
host_executable_suffix
466
439
0 commit comments