Skip to content

Commit 8b75146

Browse files
committed
src: set default config as node.config.json
nodejs/node#57171
1 parent 4efe04d commit 8b75146

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

patches/node/build_add_gn_build_files.patch

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd1
258258
if sys.platform == 'win32':
259259
files = [ x.replace('\\', '/') for x in files ]
260260
diff --git a/unofficial.gni b/unofficial.gni
261-
index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50ae50a3d8 100644
261+
index 44641b92678ab2f28e6f5de75a92878f9f3d322d..e17e4f043af6e4047ab82723ffd83187f3c04c5c 100644
262262
--- a/unofficial.gni
263263
+++ b/unofficial.gni
264-
@@ -142,32 +142,39 @@ template("node_gn_build") {
264+
@@ -142,32 +142,42 @@ template("node_gn_build") {
265265
public_configs = [
266266
":node_external_config",
267267
"deps/googletest:googletest_config",
@@ -296,15 +296,18 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
296296
"$node_v8_path:v8_libplatform",
297297
]
298298

299-
+ cflags_cc = [ "-Wno-unguarded-availability-new" ]
299+
+ cflags_cc = [
300+
+ "-Wno-unguarded-availability-new",
301+
+ "-Wno-return-stack-address"
302+
+ ]
300303
+
301304
sources = [
302305
+ "src/node_snapshot_stub.cc",
303306
+ "$root_gen_dir/electron_natives.cc",
304307
"$target_gen_dir/node_javascript.cc",
305308
] + gypi_values.node_sources
306309

307-
@@ -190,7 +197,7 @@ template("node_gn_build") {
310+
@@ -190,7 +200,7 @@ template("node_gn_build") {
308311
}
309312
if (node_use_openssl) {
310313
deps += [ "deps/ncrypto" ]
@@ -313,7 +316,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
313316
sources += gypi_values.node_crypto_sources
314317
}
315318
if (node_enable_inspector) {
316-
@@ -214,6 +221,10 @@ template("node_gn_build") {
319+
@@ -214,6 +224,10 @@ template("node_gn_build") {
317320
}
318321
}
319322

@@ -324,15 +327,15 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
324327
executable(target_name) {
325328
forward_variables_from(invoker, "*")
326329

327-
@@ -288,6 +299,7 @@ template("node_gn_build") {
330+
@@ -288,6 +302,7 @@ template("node_gn_build") {
328331
}
329332

330333
executable("node_js2c") {
331334
+ defines = []
332335
deps = [
333336
"deps/uv",
334337
"$node_simdutf_path",
335-
@@ -298,26 +310,75 @@ template("node_gn_build") {
338+
@@ -298,26 +313,75 @@ template("node_gn_build") {
336339
"src/embedded_data.cc",
337340
"src/embedded_data.h",
338341
]
@@ -418,7 +421,7 @@ index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50
418421
outputs = [ "$target_gen_dir/node_javascript.cc" ]
419422

420423
# Get the path to node_js2c executable of the host toolchain.
421-
@@ -331,11 +392,11 @@ template("node_gn_build") {
424+
@@ -331,11 +395,11 @@ template("node_gn_build") {
422425
get_label_info(":node_js2c($host_toolchain)", "name") +
423426
host_executable_suffix
424427

patches/node/build_allow_unbundling_of_node_js_dependencies.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ We don't need to do this for zlib, as the existing gn workflow uses the same
1414
Upstreamed at https://github.com/nodejs/node/pull/55903
1515

1616
diff --git a/unofficial.gni b/unofficial.gni
17-
index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f756b2e34a 100644
17+
index e17e4f043af6e4047ab82723ffd83187f3c04c5c..d591dfc99fdea4f830008502786ee44d863a31fc 100644
1818
--- a/unofficial.gni
1919
+++ b/unofficial.gni
2020
@@ -155,7 +155,6 @@ template("node_gn_build") {
@@ -25,7 +25,7 @@ index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f7
2525
"deps/nbytes",
2626
"deps/nghttp2",
2727
"deps/postject",
28-
@@ -191,7 +190,17 @@ template("node_gn_build") {
28+
@@ -194,7 +193,17 @@ template("node_gn_build") {
2929
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
3030
configs += [ "//build/config/gcc:symbol_visibility_default" ]
3131
}
@@ -44,7 +44,7 @@ index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f7
4444
if (v8_enable_i18n_support) {
4545
deps += [ "//third_party/icu" ]
4646
}
47-
@@ -219,6 +228,19 @@ template("node_gn_build") {
47+
@@ -222,6 +231,19 @@ template("node_gn_build") {
4848
sources += node_inspector.node_inspector_sources +
4949
node_inspector.node_inspector_generated_sources
5050
}

patches/node/build_option_to_use_custom_inspector_protocol_path.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ index 3d7aa148678b2646b88fa7c32abec91791b02b82..4810d93eb971b253f7dadff7011a632f
6565
gypi_values = exec_script(
6666
"../../tools/gypi_to_gn.py",
6767
diff --git a/unofficial.gni b/unofficial.gni
68-
index a8ce18acfe333350f91b3e5f235db5f756b2e34a..6bcc40b282543fc40f80c5c6659de658209844b8 100644
68+
index d591dfc99fdea4f830008502786ee44d863a31fc..9e26399482d6a1cdb843efb72c152d5cdd5e08ea 100644
6969
--- a/unofficial.gni
7070
+++ b/unofficial.gni
71-
@@ -211,13 +211,14 @@ template("node_gn_build") {
71+
@@ -214,13 +214,14 @@ template("node_gn_build") {
7272
}
7373
if (node_enable_inspector) {
7474
deps += [

0 commit comments

Comments
 (0)