This commit is contained in:
parent
b9ebe15f35
commit
4b741e7fab
128
versioned.patch
128
versioned.patch
@ -8,10 +8,10 @@ management via update_alternatives.
|
||||
|
||||
This is also important for generation of binary
|
||||
modules for multiple versions of NodeJS
|
||||
Index: node-v20.5.1/Makefile
|
||||
Index: node-v21.1.0/Makefile
|
||||
===================================================================
|
||||
--- node-v20.5.1.orig/Makefile
|
||||
+++ node-v20.5.1/Makefile
|
||||
--- node-v21.1.0.orig/Makefile
|
||||
+++ node-v21.1.0/Makefile
|
||||
@@ -76,7 +76,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT
|
||||
EXEEXT := $(shell $(PYTHON) -c \
|
||||
"import sys; print('.exe' if sys.platform == 'win32' else '')")
|
||||
@ -21,10 +21,10 @@ Index: node-v20.5.1/Makefile
|
||||
NODE ?= ./$(NODE_EXE)
|
||||
NODE_G_EXE = node_g$(EXEEXT)
|
||||
NPM ?= ./deps/npm/bin/npm-cli.js
|
||||
Index: node-v20.5.1/tools/install.py
|
||||
Index: node-v21.1.0/tools/install.py
|
||||
===================================================================
|
||||
--- node-v20.5.1.orig/tools/install.py
|
||||
+++ node-v20.5.1/tools/install.py
|
||||
--- node-v21.1.0.orig/tools/install.py
|
||||
+++ node-v21.1.0/tools/install.py
|
||||
@@ -86,7 +86,7 @@ def uninstall(paths, dst):
|
||||
try_remove(path, dst)
|
||||
|
||||
@ -76,7 +76,7 @@ Index: node-v20.5.1/tools/install.py
|
||||
|
||||
if 'true' == variables.get('node_install_npm'):
|
||||
npm_files(action)
|
||||
@@ -276,28 +276,28 @@ def headers(action):
|
||||
@@ -325,28 +325,28 @@ def headers(action):
|
||||
'src/node_buffer.h',
|
||||
'src/node_object_wrap.h',
|
||||
'src/node_version.h',
|
||||
@ -113,10 +113,10 @@ Index: node-v20.5.1/tools/install.py
|
||||
|
||||
if sys.platform == 'zos':
|
||||
zoslibinc = os.environ.get('ZOSLIB_INCLUDES')
|
||||
Index: node-v20.5.1/doc/node.1
|
||||
Index: node-v21.1.0/doc/node.1
|
||||
===================================================================
|
||||
--- node-v20.5.1.orig/doc/node.1
|
||||
+++ node-v20.5.1/doc/node.1
|
||||
--- node-v21.1.0.orig/doc/node.1
|
||||
+++ node-v21.1.0/doc/node.1
|
||||
@@ -31,24 +31,24 @@
|
||||
.Dt NODE 1
|
||||
.
|
||||
@ -146,10 +146,10 @@ Index: node-v20.5.1/doc/node.1
|
||||
.Op Fl -v8-options
|
||||
.
|
||||
.\"======================================================================
|
||||
Index: node-v20.5.1/src/node_main.cc
|
||||
Index: node-v21.1.0/src/node_main.cc
|
||||
===================================================================
|
||||
--- node-v20.5.1.orig/src/node_main.cc
|
||||
+++ node-v20.5.1/src/node_main.cc
|
||||
--- node-v21.1.0.orig/src/node_main.cc
|
||||
+++ node-v21.1.0/src/node_main.cc
|
||||
@@ -94,6 +94,7 @@ int wmain(int argc, wchar_t* wargv[]) {
|
||||
// UNIX
|
||||
|
||||
@ -158,11 +158,11 @@ Index: node-v20.5.1/src/node_main.cc
|
||||
return node::Start(argc, argv);
|
||||
}
|
||||
#endif
|
||||
Index: node-v20.5.1/tools/test.py
|
||||
Index: node-v21.1.0/tools/test.py
|
||||
===================================================================
|
||||
--- node-v20.5.1.orig/tools/test.py
|
||||
+++ node-v20.5.1/tools/test.py
|
||||
@@ -947,7 +947,7 @@ class Context(object):
|
||||
--- node-v21.1.0.orig/tools/test.py
|
||||
+++ node-v21.1.0/tools/test.py
|
||||
@@ -953,7 +953,7 @@ class Context(object):
|
||||
if self.vm is not None:
|
||||
return self.vm
|
||||
if arch == 'none':
|
||||
@ -171,11 +171,11 @@ Index: node-v20.5.1/tools/test.py
|
||||
else:
|
||||
name = 'out/%s.%s/node' % (arch, mode)
|
||||
|
||||
Index: node-v20.5.1/node.gyp
|
||||
Index: node-v21.1.0/node.gyp
|
||||
===================================================================
|
||||
--- node-v20.5.1.orig/node.gyp
|
||||
+++ node-v20.5.1/node.gyp
|
||||
@@ -23,8 +23,8 @@
|
||||
--- node-v21.1.0.orig/node.gyp
|
||||
+++ node-v21.1.0/node.gyp
|
||||
@@ -24,8 +24,8 @@
|
||||
'node_shared_openssl%': 'false',
|
||||
'node_v8_options%': '',
|
||||
'node_enable_v8_vtunejit%': 'false',
|
||||
@ -186,3 +186,89 @@ Index: node-v20.5.1/node.gyp
|
||||
'node_intermediate_lib_type%': 'static_library',
|
||||
'node_builtin_modules_path%': '',
|
||||
'linked_module_files': [
|
||||
Index: node-v21.1.0/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
|
||||
===================================================================
|
||||
--- node-v21.1.0.orig/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
|
||||
+++ node-v21.1.0/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
|
||||
@@ -6,5 +6,5 @@
|
||||
at *
|
||||
at *
|
||||
at *
|
||||
-(Use `node --trace-warnings ...` to show where the warning was created)
|
||||
+(Use `node21 --trace-warnings ...` to show where the warning was created)
|
||||
(node:*) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https:*nodejs.org*api*cli.html#cli_unhandled_rejections_mode). (rejection id: 1)
|
||||
Index: node-v21.1.0/test/parallel/test-snapshot-warning.js
|
||||
===================================================================
|
||||
--- node-v21.1.0.orig/test/parallel/test-snapshot-warning.js
|
||||
+++ node-v21.1.0/test/parallel/test-snapshot-warning.js
|
||||
@@ -60,7 +60,7 @@ tmpdir.refresh();
|
||||
stderr(output) {
|
||||
let match = output.match(/Warning: test warning/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
- match = output.match(/Use `node --trace-warnings/g);
|
||||
+ match = output.match(/Use `node21 --trace-warnings/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
return true;
|
||||
}
|
||||
@@ -79,7 +79,7 @@ tmpdir.refresh();
|
||||
// Warnings should not be handled more than once.
|
||||
let match = output.match(/Warning: test warning/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
- match = output.match(/Use `node --trace-warnings/g);
|
||||
+ match = output.match(/Use `node21 --trace-warnings/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
return true;
|
||||
}
|
||||
@@ -114,7 +114,7 @@ tmpdir.refresh();
|
||||
console.log(warningFile1, ':', warnings1);
|
||||
let match = warnings1.match(/Warning: test warning/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
- match = warnings1.match(/Use `node --trace-warnings/g);
|
||||
+ match = warnings1.match(/Use `node21 --trace-warnings/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
fs.rmSync(warningFile1, {
|
||||
maxRetries: 3, recursive: false, force: true
|
||||
@@ -140,6 +140,6 @@ tmpdir.refresh();
|
||||
console.log(warningFile2, ':', warnings1);
|
||||
match = warnings2.match(/Warning: test warning/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
- match = warnings2.match(/Use `node --trace-warnings/g);
|
||||
+ match = warnings2.match(/Use `node21 --trace-warnings/g);
|
||||
assert.strictEqual(match.length, 1);
|
||||
}
|
||||
Index: node-v21.1.0/test/fixtures/errors/throw_error_with_getter_throw.snapshot
|
||||
===================================================================
|
||||
--- node-v21.1.0.orig/test/fixtures/errors/throw_error_with_getter_throw.snapshot
|
||||
+++ node-v21.1.0/test/fixtures/errors/throw_error_with_getter_throw.snapshot
|
||||
@@ -3,6 +3,6 @@
|
||||
throw { * eslint-disable-line no-throw-literal
|
||||
^
|
||||
[object Object]
|
||||
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
|
||||
+(Use `node21 --trace-uncaught ...` to show where the exception was thrown)
|
||||
|
||||
Node.js *
|
||||
Index: node-v21.1.0/test/fixtures/errors/throw_undefined.snapshot
|
||||
===================================================================
|
||||
--- node-v21.1.0.orig/test/fixtures/errors/throw_undefined.snapshot
|
||||
+++ node-v21.1.0/test/fixtures/errors/throw_undefined.snapshot
|
||||
@@ -3,6 +3,6 @@
|
||||
throw undefined;
|
||||
^
|
||||
undefined
|
||||
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
|
||||
+(Use `node21 --trace-uncaught ...` to show where the exception was thrown)
|
||||
|
||||
Node.js *
|
||||
Index: node-v21.1.0/test/fixtures/errors/throw_null.snapshot
|
||||
===================================================================
|
||||
--- node-v21.1.0.orig/test/fixtures/errors/throw_null.snapshot
|
||||
+++ node-v21.1.0/test/fixtures/errors/throw_null.snapshot
|
||||
@@ -3,6 +3,6 @@
|
||||
throw null;
|
||||
^
|
||||
null
|
||||
-(Use `node --trace-uncaught ...` to show where the exception was thrown)
|
||||
+(Use `node21 --trace-uncaught ...` to show where the exception was thrown)
|
||||
|
||||
Node.js *
|
||||
|
Loading…
Reference in New Issue
Block a user