Skip to content

Commit 64bb553

Browse files
committed
build: encode non-ASCII Latin1 characters as one byte in JS2C
nodejs/node#51605
1 parent b03300d commit 64bb553

2 files changed

+11
-7
lines changed

patches/node/build_add_gn_build_files.patch

+10-6
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ really in 20/21. We have to wait until 22 is released to be able to
1111
build with upstream GN files.
1212

1313
diff --git a/BUILD.gn b/BUILD.gn
14-
index 1ed186b597eece7c34cb69c8e1e20870555a040d..541e7d2b8ee05677b64a3ea39c1422560fd5df75 100644
14+
index 1ed186b597eece7c34cb69c8e1e20870555a040d..7d201bb6b822f0401c3be2bc52d65bc71463748b 100644
1515
--- a/BUILD.gn
1616
+++ b/BUILD.gn
17-
@@ -1,14 +1,404 @@
17+
@@ -1,14 +1,406 @@
1818
-##############################################################################
1919
-# #
2020
-# DO NOT EDIT THIS FILE! #
@@ -258,9 +258,11 @@ index 1ed186b597eece7c34cb69c8e1e20870555a040d..541e7d2b8ee05677b64a3ea39c142256
258258
+ defines = []
259259
+ sources = [
260260
+ "tools/js2c.cc",
261-
+ "tools/executable_wrapper.h"
261+
+ "tools/executable_wrapper.h",
262+
+ "src/embedded_data.cc",
263+
+ "src/embedded_data.h",
262264
+ ]
263-
+ include_dirs = [ "tools" ]
265+
+ include_dirs = [ "tools", "src" ]
264266
+ deps = [
265267
+ "deps/simdutf($electron_js2c_toolchain)",
266268
+ "deps/uv($electron_js2c_toolchain)",
@@ -1256,10 +1258,10 @@ index 0000000000000000000000000000000000000000..af9cbada10203b387fb9732b346583b1
12561258
+}
12571259
diff --git a/filenames.json b/filenames.json
12581260
new file mode 100644
1259-
index 0000000000000000000000000000000000000000..4404338bb5d576b341cae3bf79c84334fb05654f
1261+
index 0000000000000000000000000000000000000000..f4aa1a263bb5938cf3476796ddb7747879c5d3fa
12601262
--- /dev/null
12611263
+++ b/filenames.json
1262-
@@ -0,0 +1,733 @@
1264+
@@ -0,0 +1,735 @@
12631265
+// This file is automatically generated by generate_gn_filenames_json.py
12641266
+// DO NOT EDIT
12651267
+{
@@ -1770,6 +1772,7 @@ index 0000000000000000000000000000000000000000..4404338bb5d576b341cae3bf79c84334
17701772
+ "src/connection_wrap.cc",
17711773
+ "src/dataqueue/queue.cc",
17721774
+ "src/debug_utils.cc",
1775+
+ "src/embedded_data.cc",
17731776
+ "src/encoding_binding.cc",
17741777
+ "src/env.cc",
17751778
+ "src/fs_event_wrap.cc",
@@ -1887,6 +1890,7 @@ index 0000000000000000000000000000000000000000..4404338bb5d576b341cae3bf79c84334
18871890
+ "src/dataqueue/queue.h",
18881891
+ "src/debug_utils.h",
18891892
+ "src/debug_utils-inl.h",
1893+
+ "src/embedded_data.h",
18901894
+ "src/encoding_binding.h",
18911895
+ "src/env_properties.h",
18921896
+ "src/env.h",

patches/node/build_only_create_cppgc_heap_on_non-32_bit_platforms.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ See https://gist.github.com/codebytere/275ec8923253fd6559b3d36115f7b31b for more
1818
This should be fixed and re-enabled on all platforms.
1919

2020
diff --git a/BUILD.gn b/BUILD.gn
21-
index 541e7d2b8ee05677b64a3ea39c1422560fd5df75..8d63fea3304b36654992fe718ceeb3931ef86d39 100644
21+
index 7d201bb6b822f0401c3be2bc52d65bc71463748b..38f4b5afb9e667f0958008847224fa7a6cfe64a0 100644
2222
--- a/BUILD.gn
2323
+++ b/BUILD.gn
2424
@@ -181,6 +181,10 @@ config("node_internal_config") {

0 commit comments

Comments
 (0)