From 630603042730eba0e8ed94866da521231a04383e Mon Sep 17 00:00:00 2001
From: Hirokazu MORIKAWA <morikw2@gmail.com>
Date: Sat, 1 Apr 2023 09:22:22 +0900
Subject: [PATCH] node: bump to v16.20.0

Description:
Update to v16.20.0
Fixed a bug with system-icu.
Fixed a bug when selecting arm-fpu for vfpv3-d16.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
---
 lang/node/Makefile                            | 12 +++++----
 lang/node/patches/003-path.patch              |  2 +-
 ...ecessary_libraries_for_host_execute.patch} |  0
 ...upport.patch => 991-v8_zlib_support.patch} |  0
 .../patches/992-v8_add_include_dirs.patch     | 26 +++++++++++++++++++
 ...able_pointer_authentication_on_arm64.patch |  2 +-
 6 files changed, 35 insertions(+), 7 deletions(-)
 rename lang/node/patches/{999-delete_unnecessary_libraries_for_host_execute.patch => 990-delete_unnecessary_libraries_for_host_execute.patch} (100%)
 rename lang/node/patches/{999-v8_zlib_support.patch => 991-v8_zlib_support.patch} (100%)
 create mode 100644 lang/node/patches/992-v8_add_include_dirs.patch

diff --git a/lang/node/Makefile b/lang/node/Makefile
index f292d1565e..a22e30da72 100644
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -8,12 +8,12 @@
 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
@@ -118,10 +118,12 @@ CONFIGURE_ARGS:= \
 	--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:=
diff --git a/lang/node/patches/003-path.patch b/lang/node/patches/003-path.patch
index d3183cb669..58dcad7880 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
-@@ -1326,7 +1326,8 @@ Module._initPaths = function() {
+@@ -1331,7 +1331,8 @@ Module._initPaths = function() {
      path.resolve(process.execPath, '..') :
      path.resolve(process.execPath, '..', '..');
  
diff --git a/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch b/lang/node/patches/990-delete_unnecessary_libraries_for_host_execute.patch
similarity index 100%
rename from lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch
rename to lang/node/patches/990-delete_unnecessary_libraries_for_host_execute.patch
diff --git a/lang/node/patches/999-v8_zlib_support.patch b/lang/node/patches/991-v8_zlib_support.patch
similarity index 100%
rename from lang/node/patches/999-v8_zlib_support.patch
rename to lang/node/patches/991-v8_zlib_support.patch
diff --git a/lang/node/patches/992-v8_add_include_dirs.patch b/lang/node/patches/992-v8_add_include_dirs.patch
new file mode 100644
index 0000000000..af46751635
--- /dev/null
+++ b/lang/node/patches/992-v8_add_include_dirs.patch
@@ -0,0 +1,26 @@
+--- 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',
diff --git a/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch b/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch
index c1b0ece854..4ef802d0c9 100644
--- a/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch
+++ b/lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch
@@ -1,6 +1,6 @@
 --- 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)
  
-- 
2.30.2