Skip to content

Commit 2d59a9f

Browse files
prikolium-cfxprikolium-cfx
committed
Bump NodeJS version to 22.22.0
1 parent 57d9fc3 commit 2d59a9f

6 files changed

Lines changed: 116 additions & 105 deletions

File tree

‎node‎

Submodule node updated 9843 files

‎patches/args.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1+
diff --git forkSrcPrefix/src/node_options.h forkDstPrefix/src/node_options.h
2+
index 2e73fd2a05e329910d4c064474880f770c9f5957..b0093712a25e709933cfb7b44833da51399a0030 100644
3+
--- forkSrcPrefix/src/node_options.h
4+
+++ forkDstPrefix/src/node_options.h
5+
@@ -116,6 +116,7 @@ class EnvironmentOptions : public Options {
6+
bool abort_on_uncaught_exception = false;
7+
std::vector<std::string> conditions;
8+
bool detect_module = true;
9+
+ bool cfx = true;
10+
bool disable_sigusr1 = false;
11+
bool print_required_tla = false;
12+
bool require_module = true;
113
diff --git forkSrcPrefix/src/node_options.cc forkDstPrefix/src/node_options.cc
2-
index d3b59690e917afcf725cbfb1232d6ed9f298ee3a..2b055cad524d6c0ab16d950f7b51d640187c784e 100644
14+
index 31fc23fdbfabceab3cffd81a3e6650dde1ccd13a..cd5b0942ec67292de038e3aba67280cfa42671c0 100644
315
--- forkSrcPrefix/src/node_options.cc
416
+++ forkDstPrefix/src/node_options.cc
5-
@@ -355,6 +355,9 @@ DebugOptionsParser::DebugOptionsParser() {
17+
@@ -411,6 +411,9 @@ DebugOptionsParser::DebugOptionsParser() {
618
}
719

820
EnvironmentOptionsParser::EnvironmentOptionsParser() {
@@ -12,15 +24,3 @@ index d3b59690e917afcf725cbfb1232d6ed9f298ee3a..2b055cad524d6c0ab16d950f7b51d640
1224
AddOption("--conditions",
1325
"additional user conditions for conditional exports and imports",
1426
&EnvironmentOptions::conditions,
15-
diff --git forkSrcPrefix/src/node_options.h forkDstPrefix/src/node_options.h
16-
index fc7f898a6b9b6072c15d77710c20ed1ba580966b..50e21ab6a71bacceec6919669ee002dbeeb87039 100644
17-
--- forkSrcPrefix/src/node_options.h
18-
+++ forkDstPrefix/src/node_options.h
19-
@@ -116,6 +116,7 @@ class EnvironmentOptions : public Options {
20-
bool abort_on_uncaught_exception = false;
21-
std::vector<std::string> conditions;
22-
bool detect_module = true;
23-
+ bool cfx = true;
24-
bool print_required_tla = false;
25-
bool require_module = false;
26-
std::string dns_result_order;

‎patches/enable_rtti.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
diff --git forkSrcPrefix/tools/v8_gypfiles/features.gypi forkDstPrefix/tools/v8_gypfiles/features.gypi
2-
index 6e21dac6d70ede1f6dbd6a525fb9f111d6c2eb96..bbe0a0b033f1c48119a5e73874b8d17df9e292a9 100644
2+
index 1193bf6a896e01c620685171f98a9cad16b65ff6..6dee3abca7ec994b17958de12185bd17fac90095 100644
33
--- forkSrcPrefix/tools/v8_gypfiles/features.gypi
44
+++ forkDstPrefix/tools/v8_gypfiles/features.gypi
5-
@@ -328,7 +328,8 @@
6-
7-
# Enable advanced BigInt algorithms, costing about 10-30 KiB binary size
5+
@@ -335,6 +335,9 @@
86
# depending on platform.
9-
- 'v8_advanced_bigint_algorithms%': 1
10-
+ 'v8_advanced_bigint_algorithms%': 1,
11-
+ 'use_rtti%': 1
12-
},
7+
'v8_advanced_bigint_algorithms%': 1,
138

14-
'target_defaults': {
9+
+ # Cfx changes
10+
+ 'use_rtti%': 1,
11+
+
12+
# Enable 256-bit long vector re-vectorization pass in WASM compilation pipeline.
13+
'v8_enable_wasm_simd256_revec%' : 0
14+
},
1515
diff --git forkSrcPrefix/common.gypi forkDstPrefix/common.gypi
16-
index de83a566724a36fff8b0c4ca9ba7e151a8c39f54..e1ccc53bdc0b83fd225354c1551fda8a66c57099 100644
16+
index ae31b372b96358a156761ec7e9c39c9530d1abd1..7f590685392b387fe0b7715ea7bbe2a7fbcf3fea 100644
1717
--- forkSrcPrefix/common.gypi
1818
+++ forkDstPrefix/common.gypi
19-
@@ -490,10 +490,9 @@
20-
[ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
19+
@@ -511,10 +511,9 @@
20+
[ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi openharmony"', {
2121
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
2222
'cflags_cc': [
2323
- '-fno-rtti',

‎patches/fix_icu_embedding.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git forkSrcPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp forkDstPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
2-
index 741a8a5228ca6808ea486e765e8165e229cc73fb..f5c621ab151850ad5010df3ebb42f425ec0068c2 100644
2+
index c33343318b3d2da6482a5548a9e810e3b96f6632..f144978f92f02d5855fdd9ce02a427c76beb2566 100644
33
--- forkSrcPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
44
+++ forkDstPrefix/deps/icu-small/source/tools/toolutil/pkg_genc.cpp
5-
@@ -847,7 +847,7 @@ getArchitecture(uint16_t *pCPU, uint16_t *pBits, UBool *pIsBigEndian, const char
6-
# if defined(_M_IX86)
7-
*pCPU = IMAGE_FILE_MACHINE_I386;
8-
# else
9-
- *pCPU = IMAGE_FILE_MACHINE_UNKNOWN;
10-
+ *pCPU = IMAGE_FILE_MACHINE_AMD64;
5+
@@ -877,7 +877,7 @@ getArchitecture(
6+
std::terminate(); // Unreachable.
7+
}
8+
# else
9+
- *pCPU = IMAGE_FILE_MACHINE_UNKNOWN;
10+
+ *pCPU = IMAGE_FILE_MACHINE_AMD64; // Default to x64 for non-ClangCL compilers.
11+
# endif
1112
# endif
1213
# if defined(_M_IA64) || defined(_M_AMD64) || defined (_M_ARM64)
13-
*pBits = 64; // Doesn't seem to be used for anything interesting though?

‎patches/libuv_shared.patch‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
diff --git a/common.gypi b/common.gypi
2-
index de83a56672..1f5c1781bb 100644
3-
--- a/common.gypi
4-
+++ b/common.gypi
5-
@@ -23,7 +23,7 @@
6-
'node_shared_openssl%': 'false',
7-
8-
'node_tag%': '',
9-
- 'uv_library%': 'static_library',
10-
+ 'uv_library%': 'shared_library',
11-
12-
'clang%': 0,
13-
'error_on_warn%': 'false',
14-
diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp
15-
index 6c86c3fa50..006596e86a 100644
16-
--- a/deps/uv/uv.gyp
17-
+++ b/deps/uv/uv.gyp
18-
@@ -150,7 +150,21 @@
1+
diff --git forkSrcPrefix/deps/uv/uv.gyp forkDstPrefix/deps/uv/uv.gyp
2+
index 540445f1f3249b86c6ea15e3111644da206d2e33..2c269832cae676131f804e6d94a86fa159875a6e 100644
3+
--- forkSrcPrefix/deps/uv/uv.gyp
4+
+++ forkDstPrefix/deps/uv/uv.gyp
5+
@@ -151,7 +151,21 @@
196
],
207
},
218

@@ -38,7 +25,7 @@ index 6c86c3fa50..006596e86a 100644
3825
{
3926
'target_name': 'libuv',
4027
'toolsets': ['host', 'target'],
41-
@@ -246,7 +260,7 @@
28+
@@ -251,7 +265,7 @@
4229
# This will cause gyp to set soname
4330
# Must correspond with UV_VERSION_MAJOR
4431
# in include/uv/version.h
@@ -47,11 +34,11 @@ index 6c86c3fa50..006596e86a 100644
4734
}],
4835
],
4936
}],
50-
diff --git a/node.gyp b/node.gyp
51-
index 11474953b1..a45c909938 100644
52-
--- a/node.gyp
53-
+++ b/node.gyp
54-
@@ -19,7 +19,7 @@
37+
diff --git forkSrcPrefix/node.gyp forkDstPrefix/node.gyp
38+
index 0e0071b508f605bb9b7722f8304814dc176d907e..cdcb340ae4025c536f7c95bf77aaa60d4f581b73 100644
39+
--- forkSrcPrefix/node.gyp
40+
+++ forkDstPrefix/node.gyp
41+
@@ -20,7 +20,7 @@
5542
'node_shared_zlib%': 'false',
5643
'node_shared_http_parser%': 'false',
5744
'node_shared_cares%': 'false',
@@ -60,19 +47,19 @@ index 11474953b1..a45c909938 100644
6047
'node_shared_sqlite%': 'false',
6148
'node_shared_uvwasi%': 'false',
6249
'node_shared_nghttp2%': 'false',
63-
@@ -863,6 +863,7 @@
64-
'deps/ada/ada.gyp:ada',
50+
@@ -845,6 +845,7 @@
6551
'deps/nbytes/nbytes.gyp:nbytes',
52+
'tools/v8_gypfiles/abseil.gyp:abseil',
6653
'node_js2c#host',
6754
+ 'deps/uv/uv.gyp:libuv_postbuild',
6855
],
6956

7057
'sources': [
71-
diff --git a/node.gypi b/node.gypi
72-
index 44780fe3b1..10346730bf 100644
73-
--- a/node.gypi
74-
+++ b/node.gypi
75-
@@ -188,13 +188,6 @@
58+
diff --git forkSrcPrefix/node.gypi forkDstPrefix/node.gypi
59+
index 36ed39f30855ff25c1c79aa3773d1383ddcb84f9..7842648b585602a6246691a8f818f6ae71f7eb7c 100644
60+
--- forkSrcPrefix/node.gypi
61+
+++ forkDstPrefix/node.gypi
62+
@@ -195,13 +195,6 @@
7663
'-Wl,-force_load,<(PRODUCT_DIR)/libuv<(STATIC_LIB_SUFFIX)',
7764
],
7865
},
@@ -86,3 +73,16 @@ index 44780fe3b1..10346730bf 100644
8673
'conditions': [
8774
['OS!="aix" and OS!="os400" and OS!="ios" and node_shared=="false"', {
8875
'ldflags': [
76+
diff --git forkSrcPrefix/common.gypi forkDstPrefix/common.gypi
77+
index ae31b372b96358a156761ec7e9c39c9530d1abd1..32aa21e333708d82e137c4eb1ae7888c1f6121b3 100644
78+
--- forkSrcPrefix/common.gypi
79+
+++ forkDstPrefix/common.gypi
80+
@@ -23,7 +23,7 @@
81+
'node_shared_openssl%': 'false',
82+
83+
'node_tag%': '',
84+
- 'uv_library%': 'static_library',
85+
+ 'uv_library%': 'shared_library',
86+
87+
'clang%': 0,
88+
'error_on_warn%': 'false',

‎patches/rename_output.patch‎

Lines changed: 50 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,41 @@
1+
diff --git forkSrcPrefix/vcbuild.bat forkDstPrefix/vcbuild.bat
2+
index aa3c1a34e42f300a0f681843c9766951f1835954..e4dfe43058ef845020f77d1680f6143463a1bb74 100644
3+
--- forkSrcPrefix/vcbuild.bat
4+
+++ forkDstPrefix/vcbuild.bat
5+
@@ -475,11 +475,11 @@ if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
6+
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul
7+
if errorlevel 1 echo Cannot copy install_tools scripts && goto package_error
8+
if defined dll (
9+
- copy /Y libnode.dll %TARGET_NAME%\ > nul
10+
- if errorlevel 1 echo Cannot copy libnode.dll && goto package_error
11+
+ copy /Y libnode22.dll %TARGET_NAME%\ > nul
12+
+ if errorlevel 1 echo Cannot copy libnode22.dll && goto package_error
13+
14+
- copy /Y libnode.lib %TARGET_NAME%\ > nul
15+
- if errorlevel 1 echo Cannot copy libnode.lib && goto package_error
16+
+ copy /Y libnode22.lib %TARGET_NAME%\ > nul
17+
+ if errorlevel 1 echo Cannot copy libnode22.lib && goto package_error
18+
19+
mkdir %TARGET_NAME%\Release > nul
20+
copy /Y node.def %TARGET_NAME%\Release\ > nul
21+
diff --git forkSrcPrefix/node.gyp forkDstPrefix/node.gyp
22+
index 0e0071b508f605bb9b7722f8304814dc176d907e..5edf731c23684629784c4036d2ed66686fab522a 100644
23+
--- forkSrcPrefix/node.gyp
24+
+++ forkDstPrefix/node.gyp
25+
@@ -30,7 +30,7 @@
26+
'node_v8_options%': '',
27+
'node_enable_v8_vtunejit%': 'false',
28+
'node_core_target_name%': 'node',
29+
- 'node_lib_target_name%': 'libnode',
30+
+ 'node_lib_target_name%': 'libnode22',
31+
'node_intermediate_lib_type%': 'static_library',
32+
'node_builtin_modules_path%': '',
33+
'linked_module_files': [
134
diff --git forkSrcPrefix/tools/install.py forkDstPrefix/tools/install.py
2-
index bf54249b66c0d4e179deaae5a9fd55568e694fe0..ca1ee80b0400a8c5bbf14b44a6eaa6e8666a7a49 100755
35+
index 8797b59e59c85a8877b977fa3281e50165e6f6b2..36f2993a097501957f1e89fa22699c1c1d916822 100755
336
--- forkSrcPrefix/tools/install.py
437
+++ forkDstPrefix/tools/install.py
5-
@@ -151,31 +151,31 @@ def files(options, action):
38+
@@ -157,33 +157,33 @@ def files(options, action):
639

740
if 'true' == options.variables.get('node_shared'):
841
if options.is_win:
@@ -39,41 +72,19 @@ index bf54249b66c0d4e179deaae5a9fd55568e694fe0..ca1ee80b0400a8c5bbf14b44a6eaa6e8
3972
+ link_path = abspath(options.install_path, 'lib/libnode22.so')
4073
try_symlink(options, so_name, link_path)
4174
else:
42-
- output_lib = 'libnode.' + options.variables.get('shlib_suffix')
43-
+ output_lib = 'libnode22.' + options.variables.get('shlib_suffix')
44-
action(options, [os.path.join(options.build_dir, output_lib)],
45-
os.path.join(options.variables.get('libdir'), output_lib))
46-
47-
diff --git forkSrcPrefix/node.gyp forkDstPrefix/node.gyp
48-
index 46baef1db3eacec9592296b583d76e3ffcf4de59..8f61828079ec06c3624f6ec83273f5144dfa2221 100644
49-
--- forkSrcPrefix/node.gyp
50-
+++ forkDstPrefix/node.gyp
51-
@@ -27,7 +27,7 @@
52-
'node_v8_options%': '',
53-
'node_enable_v8_vtunejit%': 'false',
54-
'node_core_target_name%': 'node',
55-
- 'node_lib_target_name%': 'libnode',
56-
+ 'node_lib_target_name%': 'libnode22',
57-
'node_intermediate_lib_type%': 'static_library',
58-
'node_builtin_modules_path%': '',
59-
'linked_module_files': [
60-
diff --git forkSrcPrefix/vcbuild.bat forkDstPrefix/vcbuild.bat
61-
index 428577c5c3d1e9ab55285d7d985fc06ec0ac1dd4..002b7e6558265557ed1c76bb94f9695f7603180d 100644
62-
--- forkSrcPrefix/vcbuild.bat
63-
+++ forkDstPrefix/vcbuild.bat
64-
@@ -458,11 +458,11 @@ if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
65-
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul
66-
if errorlevel 1 echo Cannot copy install_tools scripts && goto package_error
67-
if defined dll (
68-
- copy /Y libnode.dll %TARGET_NAME%\ > nul
69-
- if errorlevel 1 echo Cannot copy libnode.dll && goto package_error
70-
+ copy /Y libnode22.dll %TARGET_NAME%\ > nul
71-
+ if errorlevel 1 echo Cannot copy libnode22.dll && goto package_error
75+
# Ninja and Makefile generators output the library in different directories;
76+
# find out which one we have, and install first found
77+
- output_lib_name = 'libnode.' + options.variables.get('shlib_suffix')
78+
+ output_lib_name = 'libnode22.' + options.variables.get('shlib_suffix')
79+
output_lib_candidate_paths = [
80+
os.path.join(options.build_dir, output_lib_name),
81+
os.path.join(options.build_dir, "lib", output_lib_name),
82+
@@ -191,7 +191,7 @@ def files(options, action):
83+
try:
84+
output_lib = next(filter(os.path.exists, output_lib_candidate_paths))
85+
except StopIteration as not_found:
86+
- raise RuntimeError("No libnode.so to install!") from not_found
87+
+ raise RuntimeError("No libnode22.so to install!") from not_found
88+
action(options, [output_lib],
89+
os.path.join(options.variables.get('libdir'), output_lib_name))
7290

73-
- copy /Y libnode.lib %TARGET_NAME%\ > nul
74-
- if errorlevel 1 echo Cannot copy libnode.lib && goto package_error
75-
+ copy /Y libnode22.lib %TARGET_NAME%\ > nul
76-
+ if errorlevel 1 echo Cannot copy libnode22.lib && goto package_error
77-
78-
mkdir %TARGET_NAME%\Release > nul
79-
copy /Y node.def %TARGET_NAME%\Release\ > nul

0 commit comments

Comments
 (0)