node: bump v20 to 20.18.2

This commit is contained in:
coolsnowwolf 2025-02-06 17:54:48 +08:00
parent 05702ed2a4
commit a25e98fb55
8 changed files with 21 additions and 41 deletions

View File

@ -13,9 +13,9 @@ PKG_HASH:=bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35
PATCH_DIR:=./patches/v22.x
else
ifeq ($(CONFIG_NODEJS_20),y)
PKG_VERSION:=v20.12.2
PKG_VERSION:=v20.18.2
PKG_RELEASE:=1
PKG_HASH:=d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7
PKG_HASH:=69bf81b70f3a95ae0763459f02860c282d7e3a47567c8afaf126cc778176a882
PATCH_DIR:=./patches/v20.x
else
ifeq ($(CONFIG_NODEJS_18),y)
@ -108,7 +108,7 @@ define Package/node/config
choice
prompt "Version Selection"
default NODEJS_12 if mips||mipsel||mips64||mips64el
default NODEJS_22
default NODEJS_20
help
Select node.js version.
The host package version is also the same.

View File

@ -1,6 +1,6 @@
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -1529,7 +1529,8 @@ Module._initPaths = function() {
@@ -1650,7 +1650,8 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..');

View File

@ -1,20 +0,0 @@
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
@@ -1335,7 +1335,7 @@ define('lockfile-version', {
})
define('loglevel', {
- default: 'notice',
+ default: 'info',
type: [
'silent',
'error',
@@ -2135,7 +2135,7 @@ define('strict-peer-deps', {
})
define('strict-ssl', {
- default: true,
+ default: false,
type: Boolean,
description: `
Whether or not to do SSL key validation when making requests to the

View File

@ -1,8 +1,8 @@
--- a/deps/zlib/zlib.gyp
+++ b/deps/zlib/zlib.gyp
@@ -9,6 +9,7 @@
@@ -8,6 +8,7 @@
'use_system_zlib%': 0,
'arm_fpu%': '',
'llvm_version%': '0.0',
},
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'conditions': [

View File

@ -1,6 +1,6 @@
--- a/node.gyp
+++ b/node.gyp
@@ -1197,6 +1197,7 @@
@@ -1305,6 +1305,7 @@
'dependencies': [
'deps/simdutf/simdutf.gyp:simdutf#host',
],

View File

@ -136,9 +136,9 @@
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1988,15 +2009,19 @@
'WARNING_CFLAGS!': ['-Wno-invalid-offsetof']
},
@@ -1982,15 +2003,19 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [

View File

@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
@@ -1337,13 +1338,6 @@ function lookupAndConnect(self, options)
@@ -1343,13 +1344,6 @@ function lookupAndConnect(self, options)
hints: options.hints || 0,
};

View File

@ -1,10 +1,10 @@
--- a/configure.py
+++ b/configure.py
@@ -1282,7 +1282,6 @@ def configure_node(o):
# Enable branch protection for arm64
if target_arch == 'arm64':
- o['cflags']+=['-msign-return-address=all']
o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
if options.node_snapshot_main is not None:
--- a/node.gyp
+++ b/node.gyp
@@ -1306,6 +1306,7 @@
'deps/simdutf/simdutf.gyp:simdutf#host',
],
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'cflags!': ['-mbranch-protection=standard'],
'include_dirs': [
'tools',
'src',