Pullup ticket #6296 - requested by maya

lang/nodejs: aarch64 bugfix, PR port-arm/55533

(via patch)

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Aug  5 21:49:18 UTC 2020

   Modified Files:
	   pkgsrc/lang/nodejs: Makefile distinfo
	   pkgsrc/lang/nodejs/patches:
	       patch-deps_v8_src_base_platform_platform-posix.cc

   Log Message:
   nodejs: workaround issue for netbsd/aarch64 in PR port-arm/55533

   NetBSD mmap might fail depending on the choice of hint addr given, so don't
   give a hint at all.

   bump PKGREVISION.

3 files changed, 24 insertions, 8 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index b0f04f8c378..efbc2645c1a 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.185 2020/06/18 04:58:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.185.2.1 2020/08/14 17:18:38 bsiegert Exp $
 
 DISTNAME=	node-v14.4.0
+PKGREVISION=	1
 EXTRACT_SUFX=	.tar.xz
 
 USE_LANGUAGES=	c gnu++14
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index 827899b3ad2..ba5c08fc069 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.172 2020/06/03 08:41:24 adam Exp $
+$NetBSD: distinfo,v 1.172.2.1 2020/08/14 17:18:38 bsiegert Exp $
 
 SHA1 (node-v14.4.0.tar.xz) = 410b41fc6723af146914d1359ef2c19646d3bde2
 RMD160 (node-v14.4.0.tar.xz) = 830ab17bad8cbb9d04877216c157e86cb149c58f
@@ -10,7 +10,7 @@ SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_v8_src_base_atomicops.h) = d1ef20a3fee1d188687bd76836ada6f2c8e0787f
 SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = b47025f33d2991275bbcd15dbabb28900afab0e1
 SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8
-SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0d80cc6587af9220832de112834e9f50242f819f
+SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0f2975d557e71b8dea336740e0cae7d7572e6be8
 SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6
 SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
 SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5
diff --git a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
index 7a9ade46f9b..2787e324270 100644
--- a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
+++ b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
@@ -1,11 +1,26 @@
-$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.5 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.5.18.1 2020/08/14 17:18:38 bsiegert Exp $
 
 Use sysconf(_SC_THREAD_STACK_MIN) instead of PTHREAD_STACK_MIN.
 Cast explicitly.
 
---- deps/v8/src/base/platform/platform-posix.cc.orig	2018-04-24 14:41:24.000000000 +0000
+Avoid using a random hint, some low numbers cause spurious ENOMEM on netbsd
+(PR port-arm/55533)
+
+--- deps/v8/src/base/platform/platform-posix.cc.orig	2020-06-02 15:09:42.000000000 +0000
 +++ deps/v8/src/base/platform/platform-posix.cc
-@@ -480,6 +480,8 @@ int OS::GetCurrentThreadId() {
+@@ -317,6 +317,11 @@ void* OS::GetRandomMmapAddr() {
+ #endif
+ #endif
+ #endif
++
++#ifdef __NetBSD__ && V8_TARGET_ARCH_ARM64
++  raw_addr = 0;
++#endif
++
+   return reinterpret_cast<void*>(raw_addr);
+ }
+ 
+@@ -558,6 +563,8 @@ int OS::GetCurrentThreadId() {
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
@@ -14,7 +29,7 @@ Cast explicitly.
  #elif V8_OS_AIX
    return static_cast<int>(thread_self());
  #elif V8_OS_FUCHSIA
-@@ -670,8 +672,13 @@ Thread::Thread(const Options& options)
+@@ -750,8 +757,13 @@ Thread::Thread(const Options& options)
      : data_(new PlatformData),
        stack_size_(options.stack_size()),
        start_semaphore_(nullptr) {
@@ -28,7 +43,7 @@ Cast explicitly.
    }
    set_name(options.name());
  }
-@@ -687,7 +694,7 @@ static void SetThreadName(const char* na
+@@ -767,7 +779,7 @@ static void SetThreadName(const char* na
    pthread_set_name_np(pthread_self(), name);
  #elif V8_OS_NETBSD
    STATIC_ASSERT(Thread::kMaxThreadNameLength <= PTHREAD_MAX_NAMELEN_NP);