diff --git a/lang/node/Makefile b/lang/node/Makefile index 67baeb3ec4..79097a9bda 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -8,12 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node -PKG_VERSION:=20.18.0 -PKG_RELEASE:=2 +PKG_VERSION:=22.11.0 +PKG_RELEASE:=1 +NODE_MODULE_VERSION:=127 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nodejs.org/dist/v$(PKG_VERSION) -PKG_HASH:=c0819f8fc5038584d24c22002aeffd23f2d4a6fd6b337b30c502cbe4a659720c +PKG_HASH:=24e5130fa7bc1eaab218a0c9cb05e03168fa381bb9e3babddc6a11f655799222 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-v$(PKG_VERSION) @@ -42,6 +43,7 @@ define Package/node DEPENDS:=@HAS_FPU @(i386||x86_64||arm||aarch64) \ +libstdcpp +libopenssl +zlib +libnghttp2 \ +libcares +libatomic +NODEJS_ICU_SYSTEM:icu +NODEJS_ICU_SYSTEM:icu-full-data + ABI_VERSION:=$(NODE_MODULE_VERSION) endef define Package/node/description diff --git a/lang/node/patches/003-path.patch b/lang/node/patches/003-path.patch index e60ae236b5..f2000b1e3f 100644 --- a/lang/node/patches/003-path.patch +++ b/lang/node/patches/003-path.patch @@ -1,6 +1,6 @@ --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1650,7 +1650,8 @@ Module._initPaths = function() { +@@ -1779,7 +1779,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); diff --git a/lang/node/patches/004-musl_support.patch b/lang/node/patches/004-musl_support.patch index b0f950315f..d8a02f33f8 100644 --- a/lang/node/patches/004-musl_support.patch +++ b/lang/node/patches/004-musl_support.patch @@ -20,7 +20,7 @@ result = clock_gettime(CLOCK_MONOTONIC, &ts); --- a/deps/v8/src/base/platform/platform-posix.cc +++ b/deps/v8/src/base/platform/platform-posix.cc -@@ -1147,7 +1147,7 @@ bool Thread::Start() { +@@ -1207,7 +1207,7 @@ bool Thread::Start() { #if V8_OS_DARWIN // Default on Mac OS X is 512kB -- bump up to 1MB stack_size = 1 * 1024 * 1024; diff --git a/lang/node/patches/007-fix_host_build_on_macos.patch b/lang/node/patches/007-fix_host_build_on_macos.patch index b88c31476c..915fb3df71 100644 --- a/lang/node/patches/007-fix_host_build_on_macos.patch +++ b/lang/node/patches/007-fix_host_build_on_macos.patch @@ -1,11 +1,11 @@ --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py -@@ -207,7 +207,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) - +@@ -208,7 +208,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) - LINK_COMMANDS_MAC = """\ quiet_cmd_alink = LIBTOOL-STATIC $@ --cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^) -+cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^) +-cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^) ++cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^) quiet_cmd_link = LINK($(TOOLSET)) $@ cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) diff --git a/lang/node/patches/202-node_gyp.patch b/lang/node/patches/202-node_gyp.patch index a4633bf4b0..84ea6f607e 100644 --- a/lang/node/patches/202-node_gyp.patch +++ b/lang/node/patches/202-node_gyp.patch @@ -1,6 +1,6 @@ --- a/node.gyp +++ b/node.gyp -@@ -1305,6 +1305,7 @@ +@@ -1350,6 +1350,7 @@ 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host', ], diff --git a/lang/node/patches/203-icu-generic_gyp.patch b/lang/node/patches/203-icu-generic_gyp.patch index 98b522a294..08610c4ebd 100644 --- a/lang/node/patches/203-icu-generic_gyp.patch +++ b/lang/node/patches/203-icu-generic_gyp.patch @@ -16,7 +16,7 @@ 'include_dirs': [ '<(icu_path)/source/i18n', ], -@@ -200,6 +202,7 @@ +@@ -223,6 +225,7 @@ # full data - no trim needed 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ], 'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ], @@ -24,7 +24,7 @@ 'include_dirs': [ '<(icu_path)/source/common', ], -@@ -284,6 +287,7 @@ +@@ -307,6 +310,7 @@ # This file contains the small ICU data 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ], # for umachine.h @@ -32,7 +32,7 @@ 'include_dirs': [ '<(icu_path)/source/common', ], -@@ -300,6 +304,7 @@ +@@ -323,6 +327,7 @@ 'sources': [ '<@(icu_src_stubdata)' ], @@ -40,7 +40,7 @@ 'include_dirs': [ '<(icu_path)/source/common', ], -@@ -339,6 +344,7 @@ +@@ -362,6 +367,7 @@ '_XOPEN_SOURCE_EXTENDED=0', ]}], ], @@ -48,7 +48,7 @@ 'include_dirs': [ '<(icu_path)/source/common', ], -@@ -348,6 +354,7 @@ +@@ -371,6 +377,7 @@ 'cflags_c': ['-std=c99'], 'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ], 'direct_dependent_settings': { @@ -56,7 +56,7 @@ 'include_dirs': [ '<(icu_path)/source/common', ], -@@ -378,6 +385,7 @@ +@@ -401,6 +408,7 @@ '<(icu_path)/source/tools/toolutil/dbgutil.cpp', '<(icu_path)/source/tools/toolutil/dbgutil.h', ], @@ -64,7 +64,7 @@ 'include_dirs': [ '<(icu_path)/source/common', '<(icu_path)/source/i18n', -@@ -397,6 +405,7 @@ +@@ -420,6 +428,7 @@ }] ], 'direct_dependent_settings': { @@ -72,7 +72,7 @@ 'include_dirs': [ '<(icu_path)/source/common', '<(icu_path)/source/i18n', -@@ -418,6 +427,7 @@ +@@ -441,6 +450,7 @@ 'target_name': 'genrb', 'type': 'executable', 'toolsets': [ 'host' ], @@ -80,7 +80,7 @@ 'dependencies': [ 'icutools', 'icu_implementation' ], 'sources': [ '<@(icu_src_genrb)' -@@ -440,6 +450,7 @@ +@@ -463,6 +473,7 @@ 'target_name': 'iculslocs', 'toolsets': [ 'host' ], 'type': 'executable', @@ -88,7 +88,7 @@ 'dependencies': [ 'icutools' ], 'sources': [ 'iculslocs.cc', -@@ -458,6 +469,7 @@ +@@ -481,6 +492,7 @@ 'target_name': 'icupkg', 'toolsets': [ 'host' ], 'type': 'executable', @@ -96,7 +96,7 @@ 'dependencies': [ 'icutools' ], 'sources': [ '<@(icu_src_icupkg)', -@@ -475,6 +487,7 @@ +@@ -498,6 +510,7 @@ 'target_name': 'genccode', 'toolsets': [ 'host' ], 'type': 'executable', diff --git a/lang/node/patches/204-v8_gyp.patch b/lang/node/patches/204-v8_gyp.patch index 497742f197..8496a7c717 100644 --- a/lang/node/patches/204-v8_gyp.patch +++ b/lang/node/patches/204-v8_gyp.patch @@ -24,17 +24,17 @@ 'include_dirs': [ '<(generate_bytecode_output_root)', '<(SHARED_INTERMEDIATE_DIR)', -@@ -252,6 +255,7 @@ +@@ -253,6 +256,7 @@ 'sources': [ '<(V8_ROOT)/src/init/setup-isolate-full.cc', ], + 'include_dirs': [ '