Skip to content

Commit 23dbe5b

Browse files
committed
patches update
1 parent c15eabb commit 23dbe5b

4 files changed

Lines changed: 59 additions & 56 deletions

File tree

patches/enable_rtti.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
diff --git a/common.gypi b/common.gypi
2-
index efcd8da848..946952d720 100644
3-
--- a/common.gypi
4-
+++ b/common.gypi
5-
@@ -439,7 +439,7 @@
1+
diff --git forkSrcPrefix/common.gypi forkDstPrefix/common.gypi
2+
index 32a298414b5392f0d083f573f129fdc6dac85cfd..9fb52bf9a6242d0437c4d6c333748899d41e370e 100644
3+
--- forkSrcPrefix/common.gypi
4+
+++ forkDstPrefix/common.gypi
5+
@@ -489,7 +489,7 @@
66
}],
77
[ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
88
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
@@ -11,11 +11,11 @@ index efcd8da848..946952d720 100644
1111
'defines': [ '__STDC_FORMAT_MACROS' ],
1212
'ldflags': [ '-rdynamic' ],
1313
'target_conditions': [
14-
diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
15-
index c768d7a0f1..c40752b4b6 100644
16-
--- a/tools/v8_gypfiles/features.gypi
17-
+++ b/tools/v8_gypfiles/features.gypi
18-
@@ -318,7 +318,8 @@
14+
diff --git forkSrcPrefix/tools/v8_gypfiles/features.gypi forkDstPrefix/tools/v8_gypfiles/features.gypi
15+
index 6e21dac6d70ede1f6dbd6a525fb9f111d6c2eb96..bbe0a0b033f1c48119a5e73874b8d17df9e292a9 100644
16+
--- forkSrcPrefix/tools/v8_gypfiles/features.gypi
17+
+++ forkDstPrefix/tools/v8_gypfiles/features.gypi
18+
@@ -328,7 +328,8 @@
1919

2020
# Enable advanced BigInt algorithms, costing about 10-30 KiB binary size
2121
# depending on platform.

patches/internal_modules.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
diff --git a/lib/internal/bootstrap/realm.js b/lib/internal/bootstrap/realm.js
2-
index 9cb6a8add7..6090473d7d 100644
3-
--- a/lib/internal/bootstrap/realm.js
4-
+++ b/lib/internal/bootstrap/realm.js
5-
@@ -209,12 +209,12 @@ const getOwn = (target, property, receiver) => {
1+
diff --git forkSrcPrefix/lib/internal/bootstrap/realm.js forkDstPrefix/lib/internal/bootstrap/realm.js
2+
index c11f70dd6bf3298ac848ab5c1bf225bbc7250201..975bf1b35e3d8e534bface618e2895b739424fc6 100644
3+
--- forkSrcPrefix/lib/internal/bootstrap/realm.js
4+
+++ forkDstPrefix/lib/internal/bootstrap/realm.js
5+
@@ -210,12 +210,12 @@ const getOwn = (target, property, receiver) => {
66

77
const publicBuiltinIds = builtinIds
88
.filter((id) =>

patches/rename_output.patch

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,79 @@
1-
diff --git a/node.gyp b/node.gyp
2-
index 4aac64089c..8fa6ab3e81 100644
3-
--- a/node.gyp
4-
+++ b/node.gyp
5-
@@ -25,7 +25,7 @@
6-
'node_v8_options%': '',
7-
'node_enable_v8_vtunejit%': 'false',
8-
'node_core_target_name%': 'node',
9-
- 'node_lib_target_name%': 'libnode',
10-
+ 'node_lib_target_name%': 'libnode20',
11-
'node_intermediate_lib_type%': 'static_library',
12-
'node_builtin_modules_path%': '',
13-
'linked_module_files': [
14-
15-
diff --git a/tools/install.py b/tools/install.py
16-
index 17b0947aac..3e49ce2d74 100755
17-
--- a/tools/install.py
18-
+++ b/tools/install.py
1+
diff --git forkSrcPrefix/tools/install.py forkDstPrefix/tools/install.py
2+
index bf54249b66c0d4e179deaae5a9fd55568e694fe0..ca1ee80b0400a8c5bbf14b44a6eaa6e8666a7a49 100755
3+
--- forkSrcPrefix/tools/install.py
4+
+++ forkDstPrefix/tools/install.py
195
@@ -151,31 +151,31 @@ def files(options, action):
206

217
if 'true' == options.variables.get('node_shared'):
228
if options.is_win:
239
- action(options, [os.path.join(options.build_dir, 'libnode.dll')], 'bin/libnode.dll')
2410
- action(options, [os.path.join(options.build_dir, 'libnode.lib')], 'lib/libnode.lib')
25-
+ action(options, [os.path.join(options.build_dir, 'libnode20.dll')], 'bin/libnode20.dll')
26-
+ action(options, [os.path.join(options.build_dir, 'libnode20.lib')], 'lib/libnode20.lib')
11+
+ action(options, [os.path.join(options.build_dir, 'libnode22.dll')], 'bin/libnode22.dll')
12+
+ action(options, [os.path.join(options.build_dir, 'libnode22.lib')], 'lib/libnode22.lib')
2713
elif sys.platform == 'zos':
2814
# GYP will output to lib.target; see _InstallableTargetInstallPath
2915
# function in tools/gyp/pylib/gyp/generator/make.py
3016
output_prefix = os.path.join(options.build_dir, 'lib.target')
3117

3218
- output_lib = 'libnode.' + options.variables.get('shlib_suffix')
33-
+ output_lib = 'libnode20.' + options.variables.get('shlib_suffix')
19+
+ output_lib = 'libnode22.' + options.variables.get('shlib_suffix')
3420
action(options, [os.path.join(output_prefix, output_lib)], os.path.join('lib', output_lib))
3521

3622
- # create libnode.x that references libnode.so (C++ addons compat)
37-
+ # create libnode20.x that references libnode20.so (C++ addons compat)
23+
+ # create libnode22.x that references libnode22.so (C++ addons compat)
3824
os.system(os.path.dirname(os.path.realpath(__file__)) +
3925
'/zos/modifysidedeck.sh ' +
4026
abspath(options.install_path, 'lib', output_lib) + ' ' +
4127
- abspath(options.install_path, 'lib/libnode.x') + ' libnode.so')
42-
+ abspath(options.install_path, 'lib/libnode20.x') + ' libnode20.so')
28+
+ abspath(options.install_path, 'lib/libnode22.x') + ' libnode22.so')
4329

4430
- # install libnode.version.so
4531
- so_name = 'libnode.' + re.sub(r'\.x$', '.so', options.variables.get('shlib_suffix'))
46-
+ # install libnode20.version.so
47-
+ so_name = 'libnode20.' + re.sub(r'\.x$', '.so', options.variables.get('shlib_suffix'))
32+
+ # install libnode22.version.so
33+
+ so_name = 'libnode22.' + re.sub(r'\.x$', '.so', options.variables.get('shlib_suffix'))
4834
action(options, [os.path.join(output_prefix, so_name)], options.variables.get('libdir') + '/' + so_name)
4935

5036
- # create symlink of libnode.so -> libnode.version.so (C++ addons compat)
5137
- link_path = abspath(options.install_path, 'lib/libnode.so')
52-
+ # create symlink of libnode20.so -> libnode20.version.so (C++ addons compat)
53-
+ link_path = abspath(options.install_path, 'lib/libnode20.so')
38+
+ # create symlink of libnode22.so -> libnode22.version.so (C++ addons compat)
39+
+ link_path = abspath(options.install_path, 'lib/libnode22.so')
5440
try_symlink(options, so_name, link_path)
5541
else:
5642
- output_lib = 'libnode.' + options.variables.get('shlib_suffix')
57-
+ output_lib = 'libnode20.' + options.variables.get('shlib_suffix')
43+
+ output_lib = 'libnode22.' + options.variables.get('shlib_suffix')
5844
action(options, [os.path.join(options.build_dir, output_lib)],
5945
os.path.join(options.variables.get('libdir'), output_lib))
6046

61-
62-
diff --git a/vcbuild.bat b/vcbuild.bat
63-
index 75f0850b01..3baa17461f 100644
64-
--- a/vcbuild.bat
65-
+++ b/vcbuild.bat
66-
@@ -451,8 +451,8 @@ if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
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
6765
copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul
6866
if errorlevel 1 echo Cannot copy install_tools scripts && goto package_error
6967
if defined dll (
7068
- copy /Y libnode.dll %TARGET_NAME%\ > nul
7169
- if errorlevel 1 echo Cannot copy libnode.dll && goto package_error
72-
+ copy /Y libnode20.dll %TARGET_NAME%\ > nul
73-
+ if errorlevel 1 echo Cannot copy libnode20.dll && goto package_error
70+
+ copy /Y libnode22.dll %TARGET_NAME%\ > nul
71+
+ if errorlevel 1 echo Cannot copy libnode22.dll && goto package_error
72+
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
7477

7578
mkdir %TARGET_NAME%\Release > nul
7679
copy /Y node.def %TARGET_NAME%\Release\ > nul

patches/version_suffix.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
diff --git a/configure.py b/configure.py
2-
index 00c8513d68..0794bab18e 100755
3-
--- a/configure.py
4-
+++ b/configure.py
5-
@@ -1428,7 +1428,7 @@ def configure_node(o):
1+
diff --git forkSrcPrefix/configure.py forkDstPrefix/configure.py
2+
index 9c6c0a56ccac6d29d1085bcdf40740b7a85c584c..18dfea6f76ef3383ff44c905f62863c56612c5fe 100755
3+
--- forkSrcPrefix/configure.py
4+
+++ forkDstPrefix/configure.py
5+
@@ -1555,7 +1555,7 @@ def configure_node(o):
66
elif sys.platform.startswith('zos'):
77
shlib_suffix = '%s.x'
88
else:

0 commit comments

Comments
 (0)