mirror of
https://github.com/coolsnowwolf/packages.git
synced 2025-05-01 19:11:12 +08:00
node: bump v20 to 20.18.2
This commit is contained in:
parent
05702ed2a4
commit
a25e98fb55
@ -13,9 +13,9 @@ PKG_HASH:=bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35
|
|||||||
PATCH_DIR:=./patches/v22.x
|
PATCH_DIR:=./patches/v22.x
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_NODEJS_20),y)
|
ifeq ($(CONFIG_NODEJS_20),y)
|
||||||
PKG_VERSION:=v20.12.2
|
PKG_VERSION:=v20.18.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_HASH:=d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7
|
PKG_HASH:=69bf81b70f3a95ae0763459f02860c282d7e3a47567c8afaf126cc778176a882
|
||||||
PATCH_DIR:=./patches/v20.x
|
PATCH_DIR:=./patches/v20.x
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_NODEJS_18),y)
|
ifeq ($(CONFIG_NODEJS_18),y)
|
||||||
@ -108,7 +108,7 @@ define Package/node/config
|
|||||||
choice
|
choice
|
||||||
prompt "Version Selection"
|
prompt "Version Selection"
|
||||||
default NODEJS_12 if mips||mipsel||mips64||mips64el
|
default NODEJS_12 if mips||mipsel||mips64||mips64el
|
||||||
default NODEJS_22
|
default NODEJS_20
|
||||||
help
|
help
|
||||||
Select node.js version.
|
Select node.js version.
|
||||||
The host package version is also the same.
|
The host package version is also the same.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/lib/internal/modules/cjs/loader.js
|
--- a/lib/internal/modules/cjs/loader.js
|
||||||
+++ b/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, '..') :
|
||||||
path.resolve(process.execPath, '..', '..');
|
path.resolve(process.execPath, '..', '..');
|
||||||
|
|
||||||
|
@ -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
|
|
@ -1,8 +1,8 @@
|
|||||||
--- a/deps/zlib/zlib.gyp
|
--- a/deps/zlib/zlib.gyp
|
||||||
+++ b/deps/zlib/zlib.gyp
|
+++ b/deps/zlib/zlib.gyp
|
||||||
@@ -9,6 +9,7 @@
|
@@ -8,6 +8,7 @@
|
||||||
|
'use_system_zlib%': 0,
|
||||||
'arm_fpu%': '',
|
'arm_fpu%': '',
|
||||||
'llvm_version%': '0.0',
|
|
||||||
},
|
},
|
||||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||||
'conditions': [
|
'conditions': [
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/node.gyp
|
--- a/node.gyp
|
||||||
+++ b/node.gyp
|
+++ b/node.gyp
|
||||||
@@ -1197,6 +1197,7 @@
|
@@ -1305,6 +1305,7 @@
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'deps/simdutf/simdutf.gyp:simdutf#host',
|
'deps/simdutf/simdutf.gyp:simdutf#host',
|
||||||
],
|
],
|
||||||
|
@ -136,9 +136,9 @@
|
|||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'<(V8_ROOT)/include',
|
'<(V8_ROOT)/include',
|
||||||
],
|
],
|
||||||
@@ -1988,15 +2009,19 @@
|
@@ -1982,15 +2003,19 @@
|
||||||
'WARNING_CFLAGS!': ['-Wno-invalid-offsetof']
|
}],
|
||||||
},
|
],
|
||||||
'direct_dependent_settings': {
|
'direct_dependent_settings': {
|
||||||
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
|
@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816
|
|||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
// copy of this software and associated documentation files (the
|
// 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,
|
hints: options.hints || 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
--- a/configure.py
|
--- a/node.gyp
|
||||||
+++ b/configure.py
|
+++ b/node.gyp
|
||||||
@@ -1282,7 +1282,6 @@ def configure_node(o):
|
@@ -1306,6 +1306,7 @@
|
||||||
|
'deps/simdutf/simdutf.gyp:simdutf#host',
|
||||||
# Enable branch protection for arm64
|
],
|
||||||
if target_arch == 'arm64':
|
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
|
||||||
- o['cflags']+=['-msign-return-address=all']
|
+ 'cflags!': ['-mbranch-protection=standard'],
|
||||||
o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
|
'include_dirs': [
|
||||||
|
'tools',
|
||||||
if options.node_snapshot_main is not None:
|
'src',
|
||||||
|
Loading…
Reference in New Issue
Block a user