CVS commit: pkgsrc/lang/nodejs

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 14 13:47:00 UTC 2025

Modified Files:
        pkgsrc/lang/nodejs: Makefile.common distinfo
        pkgsrc/lang/nodejs/patches:
            patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc

Log Message:
nodejs: fix build on NetBSD < 11.99.4


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.304 -r1.305 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.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.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.62 pkgsrc/lang/nodejs/Makefile.common:1.63
--- pkgsrc/lang/nodejs/Makefile.common:1.62     Thu Nov 13 19:01:12 2025
+++ pkgsrc/lang/nodejs/Makefile.common  Fri Nov 14 13:47:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2025/11/13 19:01:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.63 2025/11/14 13:47:00 wiz Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs18/Makefile
 # used by lang/nodejs20/Makefile
@@ -48,7 +48,6 @@ CONFIGURE_ENV+=               GYP_DEFINES="linux_use_
 # see patch-configure.py and patch-tools_gyp_pylib_gyp_input.py
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 
-REPLACE_NODEJS+=       deps/corepack/dist/*.js
 REPLACE_NODEJS+=       deps/npm/bin/*.js
 REPLACE_PYTHON+=       configure
 REPLACE_PYTHON+=       tools/gyp/pylib/gyp/flock_tool.py

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.304 pkgsrc/lang/nodejs/distinfo:1.305
--- pkgsrc/lang/nodejs/distinfo:1.304   Thu Nov 13 19:01:12 2025
+++ pkgsrc/lang/nodejs/distinfo Fri Nov 14 13:47:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.304 2025/11/13 19:01:12 adam Exp $
+$NetBSD: distinfo,v 1.305 2025/11/14 13:47:00 wiz Exp $
 
 BLAKE2s (node-v25.2.0.tar.xz) = 4b26063c45c59ee04c0c055d221a3d44736b023512efbabf7019d5a01d1a37e6
 SHA512 (node-v25.2.0.tar.xz) = 3cd5f2e69af4e6abc799494fe1044e50ba205d8f4b822a19a293a5cfa64407308af52821c30bec3d9d0a5fbfd28aa747156f2fd77410ef629cc5605e1f3767a5
@@ -15,7 +15,7 @@ SHA1 (patch-deps_v8_src_base_platform_se
 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_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = a34c607a17ce2329af5fcdff01a59485c936e249
+SHA1 (patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = 7ae7e0f012eb2c9e83a8fa60748ccf94af91189b
 SHA1 (patch-deps_v8_tools_profiling_run-llprof.sh) = b19994d3195cc97424a3cc2ffd3ae02eacc6ffa8
 SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
 SHA1 (patch-src_compile__cache.cc) = 39a85bcb1ebe7c9bf7c431d6dc60dca5b9d63aaf

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc
diff -u pkgsrc/lang/nodejs/patches/patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.1 
pkgsrc/lang/nodejs/patches/patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.1     Thu Nov 13 19:01:13 2025
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc Fri Nov 14 13:47:00 2025
@@ -1,18 +1,26 @@
-$NetBSD: patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc,v 1.1 2025/11/13 19:01:13 adam Exp $
+$NetBSD: patch-deps_v8_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc,v 1.2 2025/11/14 13:47:00 wiz Exp $
 
 Fix build on NetBSD.
 
---- deps/v8/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig       2025-11-13 13:08:23.508427916 +0000
+--- deps/v8/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig       2025-11-11 13:52:04.000000000 +0000
 +++ deps/v8/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
-@@ -377,11 +377,7 @@ void ElfMemImage::SymbolIterator::Update
+@@ -25,6 +25,10 @@
+ #include <cstddef>
+ #include <cstdint>
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
++
+ #include "absl/base/config.h"
+ #include "absl/base/internal/raw_logging.h"
+ 
+@@ -377,7 +381,7 @@ void ElfMemImage::SymbolIterator::Update
    const ElfW(Versym) *version_symbol = image->GetVersym(index_);
    ABSL_RAW_CHECK(symbol && version_symbol, "");
    const char *const symbol_name = image->GetDynstr(symbol->st_name);
 -#if defined(__NetBSD__)
--  const int version_index = version_symbol->vs_vers & VERSYM_VERSION;
--#else
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 1199000400)
+   const int version_index = version_symbol->vs_vers & VERSYM_VERSION;
+ #else
    const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION;
--#endif
-   const ElfW(Verdef) *version_definition = nullptr;
-   const char *version_name = "";
-   if (symbol->st_shndx == SHN_UNDEF) {