include $(TOPDIR)/rules.mk
PKG_NAME:=node
-PKG_VERSION:=v16.19.1
+PKG_VERSION:=v16.20.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
-PKG_HASH:=17fb716406198125b30c94dd3d1756207b297705626afe16d8dc479a65a1d8b5
+PKG_HASH:=e0990f992234e40a51fe11f92c3816c93a77e1b081145d3dd762cd1026345349
PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
PKG_LICENSE:=MIT
--shared-libuv \
--shared-cares \
--with-intl=$(if $(CONFIG_NODEJS_ICU_SMALL),small-icu,$(if $(CONFIG_NODEJS_ICU_SYSTEM),system-icu,none)) \
- $(if $(findstring +neon,$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
- $(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \
- $(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \
+ $(if $(findstring +neon",$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
+ $(if $(findstring +neon-vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
$(if $(findstring +vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \
+ $(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \
+ $(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \
+ $(if $(findstring +vfpv3-d16",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \
--prefix=/usr
HOST_CONFIGURE_VARS:=
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
-@@ -1326,7 +1326,8 @@ Module._initPaths = function() {
+@@ -1331,7 +1331,8 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..');
--- /dev/null
+--- a/tools/icu/icu-generic.gyp
++++ b/tools/icu/icu-generic.gyp
+@@ -419,6 +419,7 @@
+ 'target_name': 'genrb',
+ 'type': 'executable',
+ 'toolsets': [ 'host' ],
++ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'dependencies': [ 'icutools' ],
+ 'sources': [
+ '<@(icu_src_genrb)'
+@@ -435,6 +436,7 @@
+ 'target_name': 'iculslocs',
+ 'toolsets': [ 'host' ],
+ 'type': 'executable',
++ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'dependencies': [ 'icutools' ],
+ 'sources': [
+ 'iculslocs.cc',
+@@ -447,6 +449,7 @@
+ 'target_name': 'icupkg',
+ 'toolsets': [ 'host' ],
+ 'type': 'executable',
++ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'dependencies': [ 'icutools' ],
+ 'sources': [
+ '<@(icu_src_icupkg)',
+@@ -458,6 +461,7 @@
+ 'target_name': 'genccode',
+ 'toolsets': [ 'host' ],
+ 'type': 'executable',
++ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'dependencies': [ 'icutools' ],
+ 'sources': [
+ '<@(icu_src_genccode)',
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -1373,6 +1373,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'],
+@@ -1397,6 +1398,8 @@
+ {
+ 'target_name': 'mksnapshot',
+ 'type': 'executable',
++ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
++ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
+ 'dependencies': [
+ 'v8_base_without_compiler',
+ 'v8_compiler_for_mksnapshot',
+@@ -1418,6 +1421,7 @@
+ {
+ 'target_name': 'torque',
+ 'type': 'executable',
++ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'dependencies': [
+ 'torque_base',
+ # "build/win:default_exe_manifest",
+@@ -1456,6 +1460,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'],
+@@ -1483,6 +1488,8 @@
+ {
+ 'target_name': 'gen-regexp-special-case',
+ 'type': 'executable',
++ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
++ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
+ 'dependencies': [
+ 'v8_libbase',
+ # "build/win:default_exe_manifest",
--- /dev/null
+--- a/deps/zlib/zlib.gyp
++++ b/deps/zlib/zlib.gyp
+@@ -43,10 +43,12 @@
+ 'zutil.c',
+ 'zutil.h',
+ ],
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '.',
+ ],
+ 'direct_dependent_settings': {
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '.',
+ ],
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -60,6 +60,7 @@
+ ],
+ 'hard_dependency': 1,
+ 'direct_dependent_settings': {
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+@@ -181,6 +182,7 @@
+ '<@(torque_outputs_cc)',
+ '<@(torque_outputs_inc)',
+ ],
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+@@ -202,6 +204,7 @@
+ 'sources': [
+ '<(generate_bytecode_builtins_list_output)',
+ ],
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(generate_bytecode_output_root)',
+ '<(SHARED_INTERMEDIATE_DIR)',
+@@ -249,9 +252,11 @@
+ 'v8_base_without_compiler',
+ 'v8_shared_internal_headers',
+ ],
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ '<(generate_bytecode_output_root)',
++ '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
+ ],
+ 'sources': [
+ '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_initializers.*?sources = ")',
+@@ -754,6 +759,7 @@
+ ],
+ 'includes': ['inspector.gypi'],
+ 'direct_dependent_settings': {
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(generate_bytecode_output_root)',
+ '<(SHARED_INTERMEDIATE_DIR)',
+@@ -1353,6 +1359,7 @@
+ }],
+ ],
+ 'direct_dependent_settings': {
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(V8_ROOT)/include',
+ ],
+@@ -1701,6 +1708,7 @@
+ }],
+ ],
+ 'direct_dependent_settings': {
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(V8_ROOT)/include',
+ ],
+@@ -1881,15 +1889,19 @@
+ }],
+ ],
+ 'direct_dependent_settings': {
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(V8_ROOT)/third_party/zlib',
+ '<(V8_ROOT)/third_party/zlib/google',
++ '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
+ ],
+ },
+ 'defines': [ 'ZLIB_IMPLEMENTATION' ],
++ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
+ 'include_dirs': [
+ '<(V8_ROOT)/third_party/zlib',
+ '<(V8_ROOT)/third_party/zlib/google',
++ '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
+ ],
+ 'sources': [
+ '<(V8_ROOT)/third_party/zlib/adler32.c',
--- /dev/null
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -242,6 +242,7 @@
+ 'sources': [
+ '<(V8_ROOT)/src/init/setup-isolate-full.cc',
+ ],
++ 'include_dirs': [ '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
+ }, # v8_init
+ {
+ 'target_name': 'v8_initializers',
+@@ -699,6 +700,7 @@
+ 'v8_shared_internal_headers',
+ ],
+ 'sources': ['<@(v8_compiler_sources)'],
++ 'include_dirs': [ '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
+ 'conditions': [
+ ['OS=="win" and _toolset=="target"', {
+ 'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h',
+@@ -1407,6 +1409,7 @@
+ 'type': 'executable',
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
++ 'include_dirs': [ '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
+ 'dependencies': [
+ 'v8_base_without_compiler',
+ 'v8_compiler_for_mksnapshot',
+++ /dev/null
---- a/tools/icu/icu-generic.gyp
-+++ b/tools/icu/icu-generic.gyp
-@@ -419,6 +419,7 @@
- 'target_name': 'genrb',
- 'type': 'executable',
- 'toolsets': [ 'host' ],
-+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
- 'dependencies': [ 'icutools' ],
- 'sources': [
- '<@(icu_src_genrb)'
-@@ -435,6 +436,7 @@
- 'target_name': 'iculslocs',
- 'toolsets': [ 'host' ],
- 'type': 'executable',
-+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
- 'dependencies': [ 'icutools' ],
- 'sources': [
- 'iculslocs.cc',
-@@ -447,6 +449,7 @@
- 'target_name': 'icupkg',
- 'toolsets': [ 'host' ],
- 'type': 'executable',
-+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
- 'dependencies': [ 'icutools' ],
- 'sources': [
- '<@(icu_src_icupkg)',
-@@ -458,6 +461,7 @@
- 'target_name': 'genccode',
- 'toolsets': [ 'host' ],
- 'type': 'executable',
-+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
- 'dependencies': [ 'icutools' ],
- 'sources': [
- '<@(icu_src_genccode)',
---- a/tools/v8_gypfiles/v8.gyp
-+++ b/tools/v8_gypfiles/v8.gyp
-@@ -1373,6 +1373,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'],
-@@ -1397,6 +1398,8 @@
- {
- 'target_name': 'mksnapshot',
- 'type': 'executable',
-+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
-+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
- 'dependencies': [
- 'v8_base_without_compiler',
- 'v8_compiler_for_mksnapshot',
-@@ -1418,6 +1421,7 @@
- {
- 'target_name': 'torque',
- 'type': 'executable',
-+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
- 'dependencies': [
- 'torque_base',
- # "build/win:default_exe_manifest",
-@@ -1456,6 +1460,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'],
-@@ -1483,6 +1488,8 @@
- {
- 'target_name': 'gen-regexp-special-case',
- 'type': 'executable',
-+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
-+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
- 'dependencies': [
- 'v8_libbase',
- # "build/win:default_exe_manifest",
--- a/configure.py
+++ b/configure.py
-@@ -1241,10 +1241,6 @@ def configure_node(o):
+@@ -1259,10 +1259,6 @@ def configure_node(o):
o['variables']['want_separate_host_toolset'] = int(cross_compiling)
+++ /dev/null
---- a/deps/zlib/zlib.gyp
-+++ b/deps/zlib/zlib.gyp
-@@ -43,10 +43,12 @@
- 'zutil.c',
- 'zutil.h',
- ],
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '.',
- ],
- 'direct_dependent_settings': {
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '.',
- ],
---- a/tools/v8_gypfiles/v8.gyp
-+++ b/tools/v8_gypfiles/v8.gyp
-@@ -60,6 +60,7 @@
- ],
- 'hard_dependency': 1,
- 'direct_dependent_settings': {
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
-@@ -181,6 +182,7 @@
- '<@(torque_outputs_cc)',
- '<@(torque_outputs_inc)',
- ],
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
-@@ -202,6 +204,7 @@
- 'sources': [
- '<(generate_bytecode_builtins_list_output)',
- ],
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(generate_bytecode_output_root)',
- '<(SHARED_INTERMEDIATE_DIR)',
-@@ -249,9 +252,11 @@
- 'v8_base_without_compiler',
- 'v8_shared_internal_headers',
- ],
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
- '<(generate_bytecode_output_root)',
-+ '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
- ],
- 'sources': [
- '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_initializers.*?sources = ")',
-@@ -754,6 +759,7 @@
- ],
- 'includes': ['inspector.gypi'],
- 'direct_dependent_settings': {
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(generate_bytecode_output_root)',
- '<(SHARED_INTERMEDIATE_DIR)',
-@@ -1353,6 +1359,7 @@
- }],
- ],
- 'direct_dependent_settings': {
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(V8_ROOT)/include',
- ],
-@@ -1701,6 +1708,7 @@
- }],
- ],
- 'direct_dependent_settings': {
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(V8_ROOT)/include',
- ],
-@@ -1881,15 +1889,19 @@
- }],
- ],
- 'direct_dependent_settings': {
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(V8_ROOT)/third_party/zlib',
- '<(V8_ROOT)/third_party/zlib/google',
-+ '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
- ],
- },
- 'defines': [ 'ZLIB_IMPLEMENTATION' ],
-+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
- 'include_dirs': [
- '<(V8_ROOT)/third_party/zlib',
- '<(V8_ROOT)/third_party/zlib/google',
-+ '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
- ],
- 'sources': [
- '<(V8_ROOT)/third_party/zlib/adler32.c',