CVS commit: pkgsrc/lang/nodejs

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May  5 07:08:06 UTC 2022

Modified Files:
        pkgsrc/lang/nodejs: Makefile Makefile.common PLIST buildlink3.mk
            distinfo nodeversion.mk
        pkgsrc/lang/nodejs/patches: patch-common.gypi
            patch-deps_v8_src_base_platform_platform-posix.cc
            patch-deps_v8_src_heap_code-range.cc patch-src_inspector__agent.cc
            patch-tools_v8_gypfiles_v8.gyp

Log Message:
nodejs: updated to 18.1.0

Version 18.1.0 (Current)

Notable Changes
- doc: add @kuriyosh to collaborators (Yoshiki Kurihara)
- (SEMVER-MINOR) lib,src: implement WebAssembly Web API (Tobias Nießen)
- (SEMVER-MINOR) test_runner: add initial CLI runner (Colin Ihrig)
- (SEMVER-MINOR) worker: add hasRef() to MessagePort (Darshan Sen)

Version 18.0.0 (Current)

Node.js 18 is here! Highlights include the update of the V8 JavaScript engine to 10.1, global fetch enabled by default, and a core test runner module.

Initially, Node.js 18 will replace Node.js 17 as our ‘Current’ release line. As per the release schedule, Node.js 18 will be the ‘Current’ release for the next 6 months and then promoted to Long-term 
Support (LTS) in October 2022. Once promoted to long-term support the release will be designated the codename ‘Hydrogen’. Node.js 18 will be supported until April 2025.

Notable Changes

Deprecations and Removals

(SEMVER-MAJOR) fs: runtime deprecate string coercion in fs.write, fs.writeFileSync (Livia Medeiros)
(SEMVER-MAJOR) dns: remove dns.lookup and dnsPromises.lookup options type coercion (Antoine du Hamel)
(SEMVER-MAJOR) process: runtime deprecate multipleResolves (Benjamin Gruenbaum)
(SEMVER-MAJOR) stream: remove thenable support (Robert Nagy)
(SEMVER-MAJOR) tls: move tls.parseCertString to end-of-life (Tobias Nießen)


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.63 -r1.64 pkgsrc/lang/nodejs/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/nodejs/buildlink3.mk
cvs rdiff -u -r1.211 -r1.212 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/nodejs/nodeversion.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/nodejs/patches/patch-common.gypi
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc \
    pkgsrc/lang/nodejs/patches/patch-tools_v8_gypfiles_v8.gyp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.232 pkgsrc/lang/nodejs/Makefile:1.233
--- pkgsrc/lang/nodejs/Makefile:1.232   Mon May  2 18:59:24 2022
+++ pkgsrc/lang/nodejs/Makefile Thu May  5 07:08:06 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.232 2022/05/02 18:59:24 adam Exp $
+# $NetBSD: Makefile,v 1.233 2022/05/05 07:08:06 adam Exp $
 
-DISTNAME=      node-v16.15.0
+DISTNAME=      node-v18.1.0
 EXTRACT_SUFX=  .tar.xz
 
-USE_LANGUAGES= c gnu++14
+USE_LANGUAGES= c gnu++17
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.45 pkgsrc/lang/nodejs/Makefile.common:1.46
--- pkgsrc/lang/nodejs/Makefile.common:1.45     Wed Mar 30 06:52:33 2022
+++ pkgsrc/lang/nodejs/Makefile.common  Thu May  5 07:08:06 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.45 2022/03/30 06:52:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.46 2022/05/05 07:08:06 adam Exp $
 # used by lang/nodejs/Makefile
-# used by lang/nodejs10/Makefile
 # used by lang/nodejs12/Makefile
 # used by lang/nodejs14/Makefile
+# used by lang/nodejs16/Makefile
 
 CATEGORIES=    lang
 MASTER_SITES=  https://nodejs.org/dist/${DISTNAME:S/node-//}/

Index: pkgsrc/lang/nodejs/PLIST
diff -u pkgsrc/lang/nodejs/PLIST:1.63 pkgsrc/lang/nodejs/PLIST:1.64
--- pkgsrc/lang/nodejs/PLIST:1.63       Wed Mar 30 06:52:33 2022
+++ pkgsrc/lang/nodejs/PLIST    Thu May  5 07:08:06 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2022/03/30 06:52:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.64 2022/05/05 07:08:06 adam Exp $
 bin/node
 include/node/common.gypi
 include/node/config.gypi
@@ -14,10 +14,53 @@ include/node/node_api_types.h
 include/node/node_buffer.h
 include/node/node_object_wrap.h
 include/node/node_version.h
+include/node/v8-array-buffer.h
+include/node/v8-callbacks.h
+include/node/v8-container.h
+include/node/v8-context.h
+include/node/v8-data.h
+include/node/v8-date.h
+include/node/v8-debug.h
+include/node/v8-embedder-heap.h
+include/node/v8-embedder-state-scope.h
+include/node/v8-exception.h
+include/node/v8-extension.h
+include/node/v8-external.h
+include/node/v8-forward.h
+include/node/v8-function-callback.h
+include/node/v8-function.h
+include/node/v8-initialization.h
 include/node/v8-internal.h
+include/node/v8-isolate.h
+include/node/v8-json.h
+include/node/v8-local-handle.h
+include/node/v8-locker.h
+include/node/v8-maybe.h
+include/node/v8-memory-span.h
+include/node/v8-message.h
+include/node/v8-microtask-queue.h
+include/node/v8-microtask.h
+include/node/v8-object.h
+include/node/v8-persistent-handle.h
 include/node/v8-platform.h
+include/node/v8-primitive-object.h
+include/node/v8-primitive.h
 include/node/v8-profiler.h
+include/node/v8-promise.h
+include/node/v8-proxy.h
+include/node/v8-regexp.h
+include/node/v8-script.h
+include/node/v8-snapshot.h
+include/node/v8-statistics.h
+include/node/v8-template.h
+include/node/v8-traced-handle.h
+include/node/v8-typed-array.h
+include/node/v8-unwinder.h
+include/node/v8-value-serializer.h
+include/node/v8-value.h
 include/node/v8-version.h
+include/node/v8-wasm.h
+include/node/v8-weak-callback-info.h
 include/node/v8.h
 include/node/v8config.h
 ${PLIST.dtrace}lib/dtrace/node.d

Index: pkgsrc/lang/nodejs/buildlink3.mk
diff -u pkgsrc/lang/nodejs/buildlink3.mk:1.19 pkgsrc/lang/nodejs/buildlink3.mk:1.20
--- pkgsrc/lang/nodejs/buildlink3.mk:1.19       Mon Apr 18 19:09:55 2022
+++ pkgsrc/lang/nodejs/buildlink3.mk    Thu May  5 07:08:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2022/04/18 19:09:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2022/05/05 07:08:06 adam Exp $
 
 BUILDLINK_TREE+=       nodejs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        nodejs
 NODEJS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nodejs+= nodejs>=10
-BUILDLINK_ABI_DEPENDS.nodejs?= nodejs>=16.14.2nb2
+BUILDLINK_ABI_DEPENDS.nodejs+= nodejs>=18.1.0
 BUILDLINK_PKGSRCDIR.nodejs?=   ../../lang/nodejs
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.211 pkgsrc/lang/nodejs/distinfo:1.212
--- pkgsrc/lang/nodejs/distinfo:1.211   Mon May  2 18:59:24 2022
+++ pkgsrc/lang/nodejs/distinfo Thu May  5 07:08:06 2022
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.211 2022/05/02 18:59:24 adam Exp $
+$NetBSD: distinfo,v 1.212 2022/05/05 07:08:06 adam Exp $
 
-BLAKE2s (node-v16.15.0.tar.xz) = 69bb0e911ecb0f1abc5e2bcc0ce402be4e6ceb6b66febb9ed10d0339f874078f
-SHA512 (node-v16.15.0.tar.xz) = c85cf4a94a0dccdcf358a3e0383499fe1fd74ac0e7b6aa888e9524c070ae8be68b9f718c8c0940d51115bbc908202cd7819e370507b7191facd375a5be231c69
-Size (node-v16.15.0.tar.xz) = 34615112 bytes
-SHA1 (patch-common.gypi) = 15393846d9dce28f963ef66faa504d5bb3e92018
+BLAKE2s (node-v18.1.0.tar.xz) = 06fd87b5d57eaa787c14fefe4badee917c22847a364ad601379e1746ec21bf7c
+SHA512 (node-v18.1.0.tar.xz) = edaf830b90b74ff7e8d1098f7f09cff91dc60738bfc612f6847bd7ac283ca76453f624057f64ba3ddcc86804bfbd652eaf8eae1398118220fd54fbf9c0a0e49c
+Size (node-v18.1.0.tar.xz) = 36841136 bytes
+SHA1 (patch-common.gypi) = 80f3645498853b9939167d152365b4fa49528b70
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa7899d9e5cf
 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) = fb0ac6f40233ef3ae03143a97ea7628be00245a8
+SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 099d538e33611c7094d89669287de7b2a17c4b6e
 SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6
 SHA1 (patch-deps_v8_src_base_strings.h) = 4d2b37491f2f74f1a573f8c1942790204e23a8bb
 SHA1 (patch-deps_v8_src_codegen_arm_cpu-arm.cc) = 84c75d61bc99c2ff9adeac3152f5b11ebb0e582b
 SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
 SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5
-SHA1 (patch-deps_v8_src_heap_code-range.cc) = 60a6049ac33b0b60c998da09b2d272bec669214f
+SHA1 (patch-deps_v8_src_heap_code-range.cc) = b281f76f4e3d8e562f596235049a6be7c5ff4de2
 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
 SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
-SHA1 (patch-src_inspector__agent.cc) = 2ec2a7be459648700488096f467a4ae6af5a9d91
+SHA1 (patch-src_inspector__agent.cc) = 3fd3d71f9d6013a6eb2a79e0442b31d2e2408a2f
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = 570fe9889767c555468a225cd7f0b398ea6a193c
 SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 4ee24115f5e97ffbd23aaa6dc62f408d381d4e22
 SHA1 (patch-tools_install.py) = c01515e3001bebd50f12bcada548f1cc0c25a49f
-SHA1 (patch-tools_v8_gypfiles_v8.gyp) = a1a40e77ee2f28d9d3dec11d6d73f2deff0d4701
+SHA1 (patch-tools_v8_gypfiles_v8.gyp) = 997748c6663e7931ead02ee47654933ec051e688

Index: pkgsrc/lang/nodejs/nodeversion.mk
diff -u pkgsrc/lang/nodejs/nodeversion.mk:1.9 pkgsrc/lang/nodejs/nodeversion.mk:1.10
--- pkgsrc/lang/nodejs/nodeversion.mk:1.9       Tue Apr  5 16:57:17 2022
+++ pkgsrc/lang/nodejs/nodeversion.mk   Thu May  5 07:08:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: nodeversion.mk,v 1.9 2022/04/05 16:57:17 adam Exp $
+# $NetBSD: nodeversion.mk,v 1.10 2022/05/05 07:08:06 adam Exp $
 
 # This file determins which nodejs version is used as a dependency for
 # a package.
@@ -8,7 +8,7 @@
 # NODE_VERSION_DEFAULT
 #      The preferred node version to use.
 #
-#      Possible values: 12 14 16
+#      Possible values: 12 14 16 18
 #      Default: 16
 #
 # === Infrastructure variables ===
@@ -27,13 +27,13 @@
 #      is significant; those listed earlier are preferred over those
 #      listed later.
 #
-#      Possible values: 12 14 16
+#      Possible values: 12 14 16 18
 #      Default: 12 14 16
 #
 # NODE_VERSIONS_INCOMPATIBLE
 #      The node versions that the package *cannot* build against.
 #
-#      Possible values: 12 14 16
+#      Possible values: 12 14 16 18
 #      Default: <empty>
 #
 # Keywords: node
@@ -58,7 +58,7 @@ BUILD_DEFS+=          NODE_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=   NODE_PACKAGE
 
 NODE_VERSION_DEFAULT?=         16
-NODE_VERSIONS_ACCEPTED?=       12 14 16
+NODE_VERSIONS_ACCEPTED?=       12 14 16 18
 NODE_VERSIONS_INCOMPATIBLE?=   # empty
 
 # Resolve NODE_VERSIONS_INCOMPATIBLE and generate the _OK vars.
@@ -93,6 +93,8 @@ _NODE_VERSION?=               none
 .elif ${_NODE_VERSION} == "14"
 .include "../../lang/nodejs14/buildlink3.mk"
 .elif ${_NODE_VERSION} == "16"
+.include "../../lang/nodejs16/buildlink3.mk"
+.elif ${_NODE_VERSION} == "18"
 .include "../../lang/nodejs/buildlink3.mk"
 .else
 PKG_FAIL_REASON+=      "No valid node version found"

Index: pkgsrc/lang/nodejs/patches/patch-common.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-common.gypi:1.9 pkgsrc/lang/nodejs/patches/patch-common.gypi:1.10
--- pkgsrc/lang/nodejs/patches/patch-common.gypi:1.9    Wed Mar 30 06:52:33 2022
+++ pkgsrc/lang/nodejs/patches/patch-common.gypi        Thu May  5 07:08:06 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-common.gypi,v 1.9 2022/03/30 06:52:33 adam Exp $
+$NetBSD: patch-common.gypi,v 1.10 2022/05/05 07:08:06 adam Exp $
 
 Add support for NetBSD.
 
---- common.gypi.orig   2021-08-03 05:54:22.000000000 +0000
+--- common.gypi.orig   2022-05-03 08:18:07.000000000 +0000
 +++ common.gypi
-@@ -376,11 +376,11 @@
+@@ -394,11 +394,11 @@
            'BUILDING_UV_SHARED=1',
          ],
        }],
@@ -16,5 +16,5 @@ Add support for NetBSD.
 -      [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
 +      [ 'OS in "linux freebsd openbsd netbsd netbsd solaris android aix cloudabi"', {
          'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
-         'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++14' ],
+         'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ],
          'defines': [ '__STDC_FORMAT_MACROS' ],

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc:1.8 pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc:1.9
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc:1.8    Mon May  2 18:59:24 2022
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc        Thu May  5 07:08:06 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.8 2022/05/02 18:59:24 adam Exp $
+$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.9 2022/05/05 07:08:06 adam Exp $
 
 Use sysconf(_SC_THREAD_STACK_MIN) instead of PTHREAD_STACK_MIN.
 Cast explicitly.
@@ -6,9 +6,9 @@ Cast explicitly.
 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   2021-04-07 04:42:14.000000000 +0900
-+++ deps/v8/src/base/platform/platform-posix.cc        2021-04-24 07:39:15.080548801 +0900
-@@ -323,6 +323,10 @@ void* OS::GetRandomMmapAddr() {
+--- deps/v8/src/base/platform/platform-posix.cc.orig   2022-05-03 08:18:09.000000000 +0000
++++ deps/v8/src/base/platform/platform-posix.cc
+@@ -384,6 +384,10 @@ void* OS::GetRandomMmapAddr() {
  #endif
  #endif
  #endif
@@ -19,7 +19,7 @@ Avoid using a random hint, some low numb
    return reinterpret_cast<void*>(raw_addr);
  }
  
-@@ -564,6 +568,8 @@ int OS::GetCurrentThreadId() {
+@@ -733,6 +737,8 @@ int OS::GetCurrentThreadId() {
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
@@ -28,26 +28,24 @@ Avoid using a random hint, some low numb
  #elif V8_OS_AIX
    return static_cast<int>(thread_self());
  #elif V8_OS_FUCHSIA
-@@ -756,8 +762,13 @@ Thread::Thread(const Options& options)
+@@ -1000,7 +1006,11 @@ Thread::Thread(const Options& options)
      : data_(new PlatformData),
        stack_size_(options.stack_size()),
        start_semaphore_(nullptr) {
 +#if V8_OS_NETBSD
-+  if (stack_size_ > 0 && static_cast<size_t>(stack_size_) < sysconf(_SC_THREAD_STACK_MIN)) {
-+    stack_size_ = sysconf(_SC_THREAD_STACK_MIN);
++  const int min_stack_size = sysconf(_SC_THREAD_STACK_MIN);
 +#else
-   if (stack_size_ > 0 && static_cast<size_t>(stack_size_) < PTHREAD_STACK_MIN) {
-     stack_size_ = PTHREAD_STACK_MIN;
+   const int min_stack_size = static_cast<int>(PTHREAD_STACK_MIN);
 +#endif
-   }
+   if (stack_size_ > 0) stack_size_ = std::max(stack_size_, min_stack_size);
    set_name(options.name());
  }
-@@ -773,7 +784,7 @@ static void SetThreadName(const char* na
+@@ -1016,7 +1026,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);
 -  pthread_setname_np(pthread_self(), "%s", name);
 +  pthread_setname_np(pthread_self(), "%s", (void *)name);
- #elif V8_OS_MACOSX
+ #elif V8_OS_DARWIN
    // pthread_setname_np is only available in 10.6 or later, so test
    // for it at runtime.

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc:1.2 pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc:1.3
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc:1.2 Mon May  2 18:59:24 2022
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc     Thu May  5 07:08:06 2022
@@ -1,19 +1,20 @@
-$NetBSD: patch-deps_v8_src_heap_code-range.cc,v 1.2 2022/05/02 18:59:24 adam Exp $
+$NetBSD: patch-deps_v8_src_heap_code-range.cc,v 1.3 2022/05/05 07:08:06 adam Exp $
 
 nodejs: disable "near code ranges" on NetBSD/evbarm-aarch64 for now.
 It results in mmap(2) errors of the PR kern/55533 variety.
 
---- deps/v8/src/heap/code-range.cc.orig        2022-03-17 21:59:26.000000000 +0000
+--- deps/v8/src/heap/code-range.cc.orig        2022-05-03 08:18:09.000000000 +0000
 +++ deps/v8/src/heap/code-range.cc
-@@ -33,7 +33,11 @@ Address CodeRangeAddressHint::GetAddress
-   base::MutexGuard guard(&mutex_);
-   auto it = recently_freed_.find(code_range_size);
-   if (it == recently_freed_.end() || it->second.empty()) {
+@@ -59,8 +59,12 @@ Address CodeRangeAddressHint::GetAddress
+       // with a higher chances to point to the free address space range.
+       return RoundUp(preferred_region.begin(), alignment);
+     }
 +#if V8_OS_NETBSD
 +    return 0;
 +#else
-     return FUNCTION_ADDR(&FunctionInStaticBinaryForAddressHint);
+     return RoundUp(FUNCTION_ADDR(&FunctionInStaticBinaryForAddressHint),
+                    alignment);
 +#endif
    }
-   Address result = it->second.back();
-   it->second.pop_back();
+ 
+   // Try to reuse near code range first.
Index: pkgsrc/lang/nodejs/patches/patch-tools_v8_gypfiles_v8.gyp
diff -u pkgsrc/lang/nodejs/patches/patch-tools_v8_gypfiles_v8.gyp:1.2 pkgsrc/lang/nodejs/patches/patch-tools_v8_gypfiles_v8.gyp:1.3
--- pkgsrc/lang/nodejs/patches/patch-tools_v8_gypfiles_v8.gyp:1.2       Wed Mar 30 06:52:33 2022
+++ pkgsrc/lang/nodejs/patches/patch-tools_v8_gypfiles_v8.gyp   Thu May  5 07:08:06 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_v8_gypfiles_v8.gyp,v 1.2 2022/03/30 06:52:33 adam Exp $
+$NetBSD: patch-tools_v8_gypfiles_v8.gyp,v 1.3 2022/05/05 07:08:06 adam Exp $
 
 Add -larm on netbsd arm platforms.
 
---- tools/v8_gypfiles/v8.gyp.orig      2021-08-03 05:54:27.000000000 +0000
+--- tools/v8_gypfiles/v8.gyp.orig      2022-05-03 08:18:12.000000000 +0000
 +++ tools/v8_gypfiles/v8.gyp
-@@ -951,6 +951,12 @@
+@@ -977,6 +977,12 @@
          }],
          # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
          # to implement atomic memory access
@@ -14,6 +14,6 @@ Add -larm on netbsd arm platforms.
 +            'libraries': ['-larm', ],
 +          },
 +        }],
-         ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64"]', {
+         ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
            'link_settings': {
              'libraries': ['-latomic', ],

Index: pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc
diff -u pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc:1.3 pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc:1.4
--- pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc:1.3        Mon Dec  9 20:03:51 2019
+++ pkgsrc/lang/nodejs/patches/patch-src_inspector__agent.cc    Thu May  5 07:08:06 2022
@@ -1,13 +1,15 @@
-$NetBSD: patch-src_inspector__agent.cc,v 1.3 2019/12/09 20:03:51 adam Exp $
+$NetBSD: patch-src_inspector__agent.cc,v 1.4 2022/05/05 07:08:06 adam Exp $
 
---- src/inspector_agent.cc.orig        2019-11-19 08:29:09.000000000 +0000
+NetBSD support.
+
+--- src/inspector_agent.cc.orig        2022-05-03 08:18:11.000000000 +0000
 +++ src/inspector_agent.cc
-@@ -112,7 +112,7 @@ static int StartDebugSignalHandler() {
+@@ -96,7 +96,7 @@ static int StartDebugSignalHandler() {
    CHECK_EQ(0, uv_sem_init(&start_io_thread_semaphore, 0));
    pthread_attr_t attr;
    CHECK_EQ(0, pthread_attr_init(&attr));
 -#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__)
 +#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-   // PTHREAD_STACK_MIN is 2 KB with musl libc, which is too small to safely
-   // receive signals. PTHREAD_STACK_MIN + MINSIGSTKSZ is 8 KB on arm64, which
+   // PTHREAD_STACK_MIN is 2 KiB with musl libc, which is too small to safely
+   // receive signals. PTHREAD_STACK_MIN + MINSIGSTKSZ is 8 KiB on arm64, which
    // is the musl architecture with the biggest MINSIGSTKSZ so let's use that