Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/nodejs nodejs: workaround issue for netbsd/aarch6...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed39a5eb02a6
branches:  trunk
changeset: 436578:ed39a5eb02a6
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Aug 05 21:49:18 2020 +0000

description:
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.

diffstat:

 lang/nodejs/Makefile                                                  |   3 +-
 lang/nodejs/distinfo                                                  |   4 +-
 lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc |  24 +++++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diffs (80 lines):

diff -r 201efdaf58f7 -r ed39a5eb02a6 lang/nodejs/Makefile
--- a/lang/nodejs/Makefile      Wed Aug 05 20:42:40 2020 +0000
+++ b/lang/nodejs/Makefile      Wed Aug 05 21:49:18 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.188 2020/08/03 11:59:58 adam Exp $
+# $NetBSD: Makefile,v 1.189 2020/08/05 21:49:18 maya Exp $
 
 DISTNAME=      node-v14.7.0
+PKGREVISION=   1
 EXTRACT_SUFX=  .tar.xz
 
 USE_LANGUAGES= c gnu++14
diff -r 201efdaf58f7 -r ed39a5eb02a6 lang/nodejs/distinfo
--- a/lang/nodejs/distinfo      Wed Aug 05 20:42:40 2020 +0000
+++ b/lang/nodejs/distinfo      Wed Aug 05 21:49:18 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.175 2020/08/03 11:59:58 adam Exp $
+$NetBSD: distinfo,v 1.176 2020/08/05 21:49:18 maya Exp $
 
 SHA1 (node-v14.7.0.tar.xz) = f847feec3dc00be5aa04772c5ac8bde4224429df
 RMD160 (node-v14.7.0.tar.xz) = b0ddaf74aa68b36e0781d09ad31fb007016b710b
@@ -10,7 +10,7 @@
 SHA1 (patch-deps_v8_src_base_atomicops.h) = 05b1f62850c3d4a9a8e94a5263be1c4267cf566d
 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) = 84300d917c172e6211a00b76bfb44ee25465ee00
 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 -r 201efdaf58f7 -r ed39a5eb02a6 lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
--- a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc     Wed Aug 05 20:42:40 2020 +0000
+++ b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc     Wed Aug 05 21:49:18 2020 +0000
@@ -1,11 +1,25 @@
-$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.6 2020/08/05 21:49:18 maya 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-07-20 22:18:45.000000000 +0000
 +++ deps/v8/src/base/platform/platform-posix.cc
-@@ -480,6 +480,8 @@ int OS::GetCurrentThreadId() {
+@@ -323,6 +323,10 @@ void* OS::GetRandomMmapAddr() {
+ #endif
+ #endif
+ #endif
++
++#ifdef __NetBSD__ && V8_TARGET_ARCH_ARM64
++  raw_addr = 0;
++#endif
+   return reinterpret_cast<void*>(raw_addr);
+ }
+ 
+@@ -564,6 +568,8 @@ int OS::GetCurrentThreadId() {
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
@@ -14,7 +28,7 @@
  #elif V8_OS_AIX
    return static_cast<int>(thread_self());
  #elif V8_OS_FUCHSIA
-@@ -670,8 +672,13 @@ Thread::Thread(const Options& options)
+@@ -756,8 +762,13 @@ Thread::Thread(const Options& options)
      : data_(new PlatformData),
        stack_size_(options.stack_size()),
        start_semaphore_(nullptr) {
@@ -28,7 +42,7 @@
    }
    set_name(options.name());
  }
-@@ -687,7 +694,7 @@ static void SetThreadName(const char* na
+@@ -773,7 +784,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);



Home | Main Index | Thread Index | Old Index