Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions node/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ NODEJS_BIN_SUM:=b294a556e639d64338823920e5866c21c02741742d2e1529ee1a225c1ec9252a
NODE_MODULE_VERSION:=127
else
ifeq ($(CONFIG_NODEJS_26),y)
PKG_VERSION:=26.5.1
PKG_VERSION:=26.7.0
PKG_RELEASE:=1
PKG_HASH:=1143281232fc4640188aaa20afb0f9c4f06031f554cd3f1e5ac86e8a0387511a
PKG_HASH:=e7feefd8d65781c9bbca1a128f8c80b357275156e6e15a3ed32cb7992035bdb2
PATCH_DIR:=./patches/v26.x
NODEJS_BIN_SUM:=2b07f09c218d473a26442bff5a90151f53f7b7c0a23bad244eda2c26303a2ba7
NODEJS_BIN_SUM:=bd6b6c31e377bad9ad579bed72e5bc11f4c879ac9452ad51d30e646ea3d828df
NODE_MODULE_VERSION:=147
else
PKG_VERSION:=24.18.1
PKG_VERSION:=24.19.0
PKG_RELEASE:=1
PKG_HASH:=b62cd76de0a0a28dd9ff88580c92344bdeb008f21c1d7479c5d8659cd96ef4e2
PKG_HASH:=16fe258006a6e86844fbe05b3b5e1e5623ca8d3da54e32d98d9e83234bf25b01
PATCH_DIR:=./patches/v24.x
NODEJS_BIN_SUM:=9f5eb6ac21845a66c493c91a253b1da32fd684e89e9b7202d4936982336be4ca
NODEJS_BIN_SUM:=f625d97cd707df4ff96254916fbc5ff014f09c09effe5a1e0ca8f6d41a8789d4
NODE_MODULE_VERSION:=137
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion node/patches/v24.x/003-path.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -2118,7 +2118,8 @@ Module._initPaths = function() {
@@ -2119,7 +2119,8 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..');

Expand Down
4 changes: 2 additions & 2 deletions node/patches/v24.x/012-changing-default-npm-settings.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
@@ -1369,7 +1369,7 @@ const definitions = {
@@ -1373,7 +1373,7 @@ const definitions = {
},
}),
loglevel: new Definition('loglevel', {
Expand All @@ -9,7 +9,7 @@
type: [
'silent',
'error',
@@ -2319,7 +2319,7 @@ const definitions = {
@@ -2365,7 +2365,7 @@ const definitions = {
flatten,
}),
'strict-ssl': new Definition('strict-ssl', {
Expand Down
2 changes: 1 addition & 1 deletion node/patches/v24.x/200-uv_gyp.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/deps/uv/uv.gyp
+++ b/deps/uv/uv.gyp
@@ -156,6 +156,7 @@
@@ -155,6 +155,7 @@
'target_name': 'libuv',
'toolsets': ['host', 'target'],
'type': '<(uv_library)',
Expand Down
4 changes: 2 additions & 2 deletions node/patches/v24.x/202-node_gyp.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/node.gyp
+++ b/node.gyp
@@ -1222,6 +1222,7 @@
@@ -1214,6 +1214,7 @@
'includes': [
'node.gypi'
],
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'include_dirs': [
'src',
'tools/msvs/genfiles',
@@ -1509,6 +1510,7 @@
@@ -1547,6 +1548,7 @@
'target_name': 'node_js2c',
'type': 'executable',
'toolsets': ['host'],
Expand Down
28 changes: 14 additions & 14 deletions node/patches/v24.x/204-v8_gyp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,63 +8,63 @@
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
@@ -226,6 +227,7 @@
@@ -227,6 +228,7 @@
'<@(torque_outputs_cc)',
'<@(torque_outputs_inc)',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
@@ -247,6 +249,7 @@
@@ -248,6 +250,7 @@
'sources': [
'<(generate_bytecode_builtins_list_output)',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(generate_bytecode_output_root)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -329,6 +332,7 @@
@@ -331,6 +334,7 @@
'fp16',
'abseil.gyp:abseil',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
'<(generate_bytecode_output_root)',
@@ -949,6 +953,7 @@
@@ -952,6 +956,7 @@
'target_name': 'v8_compiler',
'type': 'static_library',
'toolsets': ['host', 'target'],
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [
'generate_bytecode_builtins_list',
'run_torque',
@@ -1081,6 +1086,7 @@
@@ -1084,6 +1089,7 @@
],
'includes': ['inspector.gypi'],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(generate_bytecode_output_root)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -1702,6 +1708,7 @@
@@ -1705,6 +1711,7 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1722,6 +1729,7 @@
@@ -1725,6 +1732,7 @@
{
'target_name': 'bytecode_builtins_list_generator',
'type': 'executable',
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host'],
@@ -1762,6 +1770,8 @@
@@ -1765,6 +1773,8 @@
{
'target_name': 'mksnapshot',
'type': 'executable',
Expand All @@ -73,23 +73,23 @@
'dependencies': [
'v8_base_without_compiler',
'v8_compiler_for_mksnapshot',
@@ -1818,6 +1828,7 @@
@@ -1821,6 +1831,7 @@
{
'target_name': 'torque',
'type': 'executable',
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [
'torque_base',
'abseil.gyp:abseil',
@@ -1872,6 +1883,7 @@
@@ -1875,6 +1886,7 @@
{
'target_name': 'torque-language-server',
'type': 'executable',
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host'],
@@ -1914,6 +1926,8 @@
@@ -1917,6 +1929,8 @@
{
'target_name': 'gen-regexp-special-case',
'type': 'executable',
Expand All @@ -98,15 +98,15 @@
'dependencies': [
'v8_libbase',
# "build/win:default_exe_manifest",
@@ -2165,6 +2179,7 @@
@@ -2169,6 +2183,7 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -2306,12 +2321,14 @@
@@ -2310,12 +2325,14 @@
}],
],
'direct_dependent_settings': {
Expand All @@ -121,7 +121,7 @@
'include_dirs': [
'<(V8_ROOT)/third_party/zlib',
'<(V8_ROOT)/third_party/zlib/google',
@@ -2359,6 +2376,7 @@
@@ -2363,6 +2380,7 @@
'variables': {
'FP16_ROOT': '../../deps/v8/third_party/fp16',
},
Expand Down
2 changes: 1 addition & 1 deletion node/patches/v24.x/999-localhost-no-addrconfig.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
@@ -1431,13 +1432,6 @@ function lookupAndConnect(self, options)
@@ -1587,13 +1588,6 @@ function lookupAndConnect(self, options)
hints: options.hints || 0,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/node.gyp
+++ b/node.gyp
@@ -1223,6 +1223,7 @@
@@ -1215,6 +1215,7 @@
'node.gypi'
],
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
Expand Down
4 changes: 2 additions & 2 deletions node/patches/v26.x/012-changing-default-npm-settings.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
@@ -1373,7 +1373,7 @@ const definitions = {
@@ -1384,7 +1384,7 @@ const definitions = {
},
}),
loglevel: new Definition('loglevel', {
Expand All @@ -9,7 +9,7 @@
type: [
'silent',
'error',
@@ -2365,7 +2365,7 @@ const definitions = {
@@ -2393,7 +2393,7 @@ const definitions = {
flatten,
}),
'strict-ssl': new Definition('strict-ssl', {
Expand Down
2 changes: 1 addition & 1 deletion node/patches/v26.x/999-localhost-no-addrconfig.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
@@ -1587,13 +1588,6 @@ function lookupAndConnect(self, options)
@@ -1661,13 +1662,6 @@ function lookupAndConnect(self, options)
hints: options.hints || 0,
};

Expand Down