CVS commit: pkgsrc/devel/abseil

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Nov 15 11:51:58 UTC 2025

Modified Files:
        pkgsrc/devel/abseil: distinfo
        pkgsrc/devel/abseil/patches:
            patch-absl_debugging_internal_elf__mem__image.cc

Log Message:
devel/abseil: Fix build under NetBSD/amd64 11.99.4


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/abseil/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/abseil/patches/patch-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/devel/abseil/distinfo
diff -u pkgsrc/devel/abseil/distinfo:1.34 pkgsrc/devel/abseil/distinfo:1.35
--- pkgsrc/devel/abseil/distinfo:1.34   Wed Sep 24 12:06:24 2025
+++ pkgsrc/devel/abseil/distinfo        Sat Nov 15 11:51:58 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2025/09/24 12:06:24 adam Exp $
+$NetBSD: distinfo,v 1.35 2025/11/15 11:51:58 ryoon Exp $
 
 BLAKE2s (abseil-20250814.1-20250814.1.tar.gz) = c7f7ab8bb9c06aa5f7bd955397fe313920bb60850409ba6751b28099490cb02b
 SHA512 (abseil-20250814.1-20250814.1.tar.gz) = 7083b73c3cf763f6f7a7edb70a5171f44d27045a0f5e52ca043e0a86379af2c50cf85dbfea30ebaa22a7bb2929452581d26b1ba18945023b057267d4c3bad2f7
 Size (abseil-20250814.1-20250814.1.tar.gz) = 2235716 bytes
 SHA1 (patch-absl_base_internal_sysinfo.cc) = c96dd302dde0f6071a8353a5877a3bac37949467
-SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = 4165ab657a03194a5266815440f40cf4aa958f7b
+SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = e64fc14e9569107c518c15dd3d361fd4bb417a76
 SHA1 (patch-absl_debugging_internal_vdso__support.cc) = 2292c5b0f2b41679039a1697508343ff5b6cc401
 SHA1 (patch-absl_time_internal_cctz_src_time__zone__format.cc) = 7f3b84cd63f847ffa4c2fcb04b28d1535ea1454b

Index: pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc
diff -u pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc:1.4 pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc:1.5
--- pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc:1.4    Sun Aug 18 13:52:33 2024
+++ pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc        Sat Nov 15 11:51:58 2025
@@ -1,10 +1,23 @@
-$NetBSD: patch-absl_debugging_internal_elf__mem__image.cc,v 1.4 2024/08/18 13:52:33 bsiegert Exp $
+$NetBSD: patch-absl_debugging_internal_elf__mem__image.cc,v 1.5 2025/11/15 11:51:58 ryoon Exp $
 
 NetBSD 9 does not have DT_GNU_HASH
 
---- absl/debugging/internal/elf_mem_image.cc.orig      2024-08-18 13:46:50.153911360 +0000
+NetBSD 11.99.4 or later, definitions for ELF have changed.
+
+--- absl/debugging/internal/elf_mem_image.cc.orig      2025-09-22 18:24:38.000000000 +0000
 +++ absl/debugging/internal/elf_mem_image.cc
-@@ -225,9 +225,11 @@ void ElfMemImage::Init(const void *base)
+@@ -25,6 +25,10 @@
+ #include <cstddef>
+ #include <cstdint>
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "absl/base/config.h"
+ #include "absl/base/internal/raw_logging.h"
+ 
+@@ -225,9 +229,11 @@ void ElfMemImage::Init(const void *base)
        case DT_HASH:
          sysv_hash = reinterpret_cast<uint32_t *>(value);
          break;
@@ -16,3 +29,12 @@ NetBSD 9 does not have DT_GNU_HASH
        case DT_SYMTAB:
          dynsym_ = reinterpret_cast<ElfW(Sym) *>(value);
          break;
+@@ -377,7 +383,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__)
++#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;