Skip to content

Commit

Permalink
Merge pull request #1032 from nxhack/dev
Browse files Browse the repository at this point in the history
node: bump to 16.11.0
  • Loading branch information
nxhack authored Oct 12, 2021
2 parents c9277f2 + b351f57 commit 1d8275b
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 10 deletions.
4 changes: 2 additions & 2 deletions node/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=node

ifeq ($(CONFIG_NODEJS_16),y)
PKG_VERSION:=v16.10.0
PKG_VERSION:=v16.11.0
PKG_RELEASE:=1
PKG_HASH:=97dc1aca232b4911e0b9e5a23a03200ab8ef05157e03c732315b579481bf7912
PKG_HASH:=d3f631bd0d215ded26b49b2eae42c84de2ba1b46f00cc2930809900a0f7165ae
PATCH_DIR:=./patches/v16.x
else
ifeq ($(CONFIG_NODEJS_14),y)
Expand Down
4 changes: 2 additions & 2 deletions node/patches/v16.x/004-musl_support.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/deps/v8/src/base/platform/condition-variable.cc
+++ b/deps/v8/src/base/platform/condition-variable.cc
@@ -16,7 +16,7 @@ namespace base {
@@ -20,7 +20,7 @@ namespace base {

ConditionVariable::ConditionVariable() {
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
Expand All @@ -9,7 +9,7 @@
// On Free/Net/OpenBSD and Linux with glibc we can change the time
// source for pthread_cond_timedwait() to use the monotonic clock.
pthread_condattr_t attr;
@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* m
@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
&native_handle_, &mutex->native_handle(), &ts);
#else
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
Expand Down
6 changes: 3 additions & 3 deletions node/patches/v16.x/010-execvp-arg-list-too-long.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
@@ -155,6 +155,30 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOL
@@ -154,6 +154,30 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOL
quiet_cmd_link = LINK($(TOOLSET)) $@
cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group

Expand Down Expand Up @@ -31,7 +31,7 @@
# We support two kinds of shared objects (.so):
# 1) shared_library, which is just bundling together many dependent libraries
# into a link line.
@@ -199,6 +223,30 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET))
@@ -198,6 +222,30 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET))
quiet_cmd_alink_thin = AR($(TOOLSET)) $@
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)

Expand Down Expand Up @@ -62,7 +62,7 @@
# Due to circular dependencies between libraries :(, we wrap the
# special "figure out circular dependencies" flags around the entire
# input list during linking.
@@ -1766,21 +1814,35 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
@@ -1768,21 +1816,35 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
self.flavor not in ("mac", "openbsd", "netbsd", "win")
and not self.is_standalone_static_library
):
Expand Down
2 changes: 1 addition & 1 deletion node/patches/v16.x/999-cast_for_mips32.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc
+++ b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc
@@ -4231,7 +4231,7 @@ void CodeGenerator::AssembleReturn(Instr
@@ -4230,7 +4230,7 @@ void CodeGenerator::AssembleReturn(Instr
} else if (FLAG_debug_code) {
__ Assert(eq, AbortReason::kUnexpectedAdditionalPopValue,
g.ToRegister(additional_pop_count),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- a/deps/v8/src/trap-handler/trap-handler.h
+++ b/deps/v8/src/trap-handler/trap-handler.h
@@ -17,19 +17,16 @@ namespace v8 {
namespace internal {
namespace trap_handler {

-// X64 on Linux, Windows, MacOS, FreeBSD.
-#if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 && \
- ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_MACOSX || \
- V8_OS_FREEBSD)
+#if V8_TARGET_ARCH_X64 && V8_OS_LINUX && !V8_OS_ANDROID
#define V8_TRAP_HANDLER_SUPPORTED true
-// Arm64 (non-simulator) on Mac.
-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX
+#elif V8_TARGET_ARCH_X64 && V8_OS_WIN
#define V8_TRAP_HANDLER_SUPPORTED true
-// Arm64 simulator on x64 on Linux or Mac.
-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && (V8_OS_LINUX || V8_OS_MACOSX)
-#define V8_TRAP_HANDLER_VIA_SIMULATOR
+#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
+#define V8_TRAP_HANDLER_SUPPORTED true
+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
+#define V8_TRAP_HANDLER_SUPPORTED true
+#elif V8_HOST_ARCH_ARM64 && V8_TARGET_ARCH_ARM64 && V8_OS_MACOSX
#define V8_TRAP_HANDLER_SUPPORTED true
-// Everything else is unsupported.
#else
#define V8_TRAP_HANDLER_SUPPORTED false
#endif
4 changes: 2 additions & 2 deletions node/patches/v16.x/999-v8_zlib_support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1751,6 +1758,7 @@
@@ -1748,6 +1755,7 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1940,15 +1948,19 @@
@@ -1937,15 +1945,19 @@
}],
],
'direct_dependent_settings': {
Expand Down

0 comments on commit 1d8275b

Please sign in to comment.