forked from pool/nodejs22
Adam Majer
c1a219c943
For overview of changes and details since 21.x and earlier see https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V22.md#22.1.0 - Imported patches from 21.x: * cares_public_headers.patch * fix_ci_tests.patch * flaky_test_rerun.patch * gcc13.patch * legacy_python.patch * linker_lto_jobs.patch * manual_configure.patch * node-gyp-addon-gypi.patch * node-gyp-config.patch * nodejs-libpath.patch * npm_search_paths.patch * openssl_binary_detection.patch * qemu_timeouts_arches.patch * skip_no_console.patch * sle12_python3_compat.patch * test-skip-y2038-on-32bit-time_t.patch * versioned.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs22?expand=0&rev=1
275 lines
11 KiB
Diff
275 lines
11 KiB
Diff
Author: Adam Majer <amajer@suse.de>
|
|
Date: Fri May 11 16:10:16 CEST 2018
|
|
Summary: Generate versioned binaries
|
|
|
|
Generate versioned binaries and install paths
|
|
so we can allow concurrent installations and
|
|
management via update_alternatives.
|
|
|
|
This is also important for generation of binary
|
|
modules for multiple versions of NodeJS
|
|
Index: node-v22.1.0/Makefile
|
|
===================================================================
|
|
--- node-v22.1.0.orig/Makefile
|
|
+++ node-v22.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 '')")
|
|
|
|
-NODE_EXE = node$(EXEEXT)
|
|
+NODE_EXE = node22$(EXEEXT)
|
|
# Use $(PWD) so we can cd to anywhere before calling this
|
|
NODE ?= "$(PWD)/$(NODE_EXE)"
|
|
NODE_G_EXE = node_g$(EXEEXT)
|
|
Index: node-v22.1.0/tools/install.py
|
|
===================================================================
|
|
--- node-v22.1.0.orig/tools/install.py
|
|
+++ node-v22.1.0/tools/install.py
|
|
@@ -87,7 +87,7 @@ def uninstall(options, paths, dest):
|
|
try_remove(options, path, dest)
|
|
|
|
def package_files(options, action, name, bins):
|
|
- target_path = os.path.join(libdir(options), 'node_modules', name)
|
|
+ target_path = os.path.join(libdir(options), 'node_modules', name + '21')
|
|
|
|
# don't install npm if the target path is a symlink, it probably means
|
|
# that a dev version of npm is installed there
|
|
@@ -108,19 +108,19 @@ def package_files(options, action, name,
|
|
if action == uninstall:
|
|
action(options, [link_path], os.path.join('bin', bin_name))
|
|
elif action == install:
|
|
- try_symlink(options, os.path.join('..', libdir(options), 'node_modules', name, bin_target), link_path)
|
|
+ try_symlink(options, os.path.join('..', libdir(options), 'node_modules', name + '21', bin_target), link_path)
|
|
else:
|
|
assert 0 # unhandled action type
|
|
|
|
def npm_files(options, action):
|
|
package_files(options, action, 'npm', {
|
|
- 'npm': 'bin/npm-cli.js',
|
|
- 'npx': 'bin/npx-cli.js',
|
|
+ 'npm22': 'bin/npm-cli.js',
|
|
+ 'npx22': 'bin/npx-cli.js',
|
|
})
|
|
|
|
def corepack_files(options, action):
|
|
package_files(options, action, 'corepack', {
|
|
- 'corepack': 'dist/corepack.js',
|
|
+ 'corepack22': 'dist/corepack.js',
|
|
# Not the default just yet:
|
|
# 'yarn': 'dist/yarn.js',
|
|
# 'yarnpkg': 'dist/yarn.js',
|
|
@@ -149,7 +149,7 @@ def subdir_files(options, path, dest, ac
|
|
action(options, files_in_path, subdir + os.path.sep)
|
|
|
|
def files(options, action):
|
|
- node_bin = 'node'
|
|
+ node_bin = 'node22'
|
|
if options.is_win:
|
|
node_bin += '.exe'
|
|
action(options, [os.path.join(options.build_dir, node_bin)], os.path.join('bin', node_bin))
|
|
@@ -190,7 +190,7 @@ def files(options, action):
|
|
if 'openbsd' in sys.platform:
|
|
action(options, ['doc/node.1'], 'man/man1/')
|
|
else:
|
|
- action(options, ['doc/node.1'], 'share/man/man1/')
|
|
+ action(options, ['doc/node.1'], 'share/man/man1/node22.1')
|
|
|
|
if 'true' == options.variables.get('node_install_npm'):
|
|
npm_files(options, action)
|
|
@@ -333,28 +333,28 @@ def headers(options, action):
|
|
'src/node_buffer.h',
|
|
'src/node_object_wrap.h',
|
|
'src/node_version.h',
|
|
- ], 'include/node/')
|
|
+ ], 'include/node22/')
|
|
|
|
# Add the expfile that is created on AIX
|
|
if sys.platform.startswith('aix') or sys.platform == "os400":
|
|
- action(options, ['out/Release/node.exp'], 'include/node/')
|
|
+ action(options, ['out/Release/node.exp'], 'include/node22/')
|
|
|
|
- subdir_files(options, os.path.join(options.v8_dir, 'include'), 'include/node/', wanted_v8_headers)
|
|
+ subdir_files(options, os.path.join(options.v8_dir, 'include'), 'include/node22/', wanted_v8_headers)
|
|
|
|
if 'false' == options.variables.get('node_shared_libuv'):
|
|
- subdir_files(options, 'deps/uv/include', 'include/node/', action)
|
|
+ subdir_files(options, 'deps/uv/include', 'include/node22/', action)
|
|
|
|
if 'true' == options.variables.get('node_use_openssl') and \
|
|
'false' == options.variables.get('node_shared_openssl'):
|
|
- subdir_files(options, 'deps/openssl/openssl/include/openssl', 'include/node/openssl/', action)
|
|
- subdir_files(options, 'deps/openssl/config/archs', 'include/node/openssl/archs', action)
|
|
- subdir_files(options, 'deps/openssl/config', 'include/node/openssl', action)
|
|
+ subdir_files(options, 'deps/openssl/openssl/include/openssl', 'include/node22/openssl/', action)
|
|
+ subdir_files(options, 'deps/openssl/config/archs', 'include/node22/openssl/archs', action)
|
|
+ subdir_files(options, 'deps/openssl/config', 'include/node22/openssl', action)
|
|
|
|
if 'false' == options.variables.get('node_shared_zlib'):
|
|
action(options, [
|
|
'deps/zlib/zconf.h',
|
|
'deps/zlib/zlib.h',
|
|
- ], 'include/node/')
|
|
+ ], 'include/node22/')
|
|
|
|
if sys.platform == 'zos':
|
|
zoslibinc = os.environ.get('ZOSLIB_INCLUDES')
|
|
Index: node-v22.1.0/doc/node.1
|
|
===================================================================
|
|
--- node-v22.1.0.orig/doc/node.1
|
|
+++ node-v22.1.0/doc/node.1
|
|
@@ -31,24 +31,24 @@
|
|
.Dt NODE 1
|
|
.
|
|
.Sh NAME
|
|
-.Nm node
|
|
+.Nm node22
|
|
.Nd server-side JavaScript runtime
|
|
.
|
|
.\"======================================================================
|
|
.Sh SYNOPSIS
|
|
-.Nm node
|
|
+.Nm node22
|
|
.Op Ar options
|
|
.Op Ar v8-options
|
|
.Op Fl e Ar string | Ar script.js | Fl
|
|
.Op Fl -
|
|
.Op Ar arguments ...
|
|
.
|
|
-.Nm node
|
|
+.Nm node22
|
|
.Cm inspect
|
|
.Op Fl e Ar string | Ar script.js | Fl | Ar <host>:<port>
|
|
.Ar ...
|
|
.
|
|
-.Nm node
|
|
+.Nm node22
|
|
.Op Fl -v8-options
|
|
.
|
|
.\"======================================================================
|
|
Index: node-v22.1.0/src/node_main.cc
|
|
===================================================================
|
|
--- node-v22.1.0.orig/src/node_main.cc
|
|
+++ node-v22.1.0/src/node_main.cc
|
|
@@ -94,6 +94,7 @@ int wmain(int argc, wchar_t* wargv[]) {
|
|
// UNIX
|
|
|
|
int main(int argc, char* argv[]) {
|
|
+ setenv("NODE_VERSION", "22", 0);
|
|
return node::Start(argc, argv);
|
|
}
|
|
#endif
|
|
Index: node-v22.1.0/tools/test.py
|
|
===================================================================
|
|
--- node-v22.1.0.orig/tools/test.py
|
|
+++ node-v22.1.0/tools/test.py
|
|
@@ -954,7 +954,7 @@ class Context(object):
|
|
if self.vm is not None:
|
|
return self.vm
|
|
if arch == 'none':
|
|
- name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node'
|
|
+ name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node22'
|
|
else:
|
|
name = 'out/%s.%s/node' % (arch, mode)
|
|
|
|
Index: node-v22.1.0/node.gyp
|
|
===================================================================
|
|
--- node-v22.1.0.orig/node.gyp
|
|
+++ node-v22.1.0/node.gyp
|
|
@@ -24,8 +24,8 @@
|
|
'node_shared_openssl%': 'false',
|
|
'node_v8_options%': '',
|
|
'node_enable_v8_vtunejit%': 'false',
|
|
- 'node_core_target_name%': 'node',
|
|
- 'node_lib_target_name%': 'libnode',
|
|
+ 'node_core_target_name%': 'node22',
|
|
+ 'node_lib_target_name%': 'libnode22',
|
|
'node_intermediate_lib_type%': 'static_library',
|
|
'node_builtin_modules_path%': '',
|
|
'linked_module_files': [
|
|
Index: node-v22.1.0/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
|
|
===================================================================
|
|
--- node-v22.1.0.orig/test/fixtures/errors/promise_unhandled_warn_with_error.snapshot
|
|
+++ node-v22.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 `node22 --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-v22.1.0/test/parallel/test-snapshot-warning.js
|
|
===================================================================
|
|
--- node-v22.1.0.orig/test/parallel/test-snapshot-warning.js
|
|
+++ node-v22.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 `node22 --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 `node22 --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 `node22 --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 `node22 --trace-warnings/g);
|
|
assert.strictEqual(match.length, 1);
|
|
}
|
|
Index: node-v22.1.0/test/fixtures/errors/throw_error_with_getter_throw.snapshot
|
|
===================================================================
|
|
--- node-v22.1.0.orig/test/fixtures/errors/throw_error_with_getter_throw.snapshot
|
|
+++ node-v22.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 `node22 --trace-uncaught ...` to show where the exception was thrown)
|
|
|
|
Node.js *
|
|
Index: node-v22.1.0/test/fixtures/errors/throw_undefined.snapshot
|
|
===================================================================
|
|
--- node-v22.1.0.orig/test/fixtures/errors/throw_undefined.snapshot
|
|
+++ node-v22.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 `node22 --trace-uncaught ...` to show where the exception was thrown)
|
|
|
|
Node.js *
|
|
Index: node-v22.1.0/test/fixtures/errors/throw_null.snapshot
|
|
===================================================================
|
|
--- node-v22.1.0.orig/test/fixtures/errors/throw_null.snapshot
|
|
+++ node-v22.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 `node22 --trace-uncaught ...` to show where the exception was thrown)
|
|
|
|
Node.js *
|