CVS commit: pkgsrc/devel/abseil

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Aug 18 13:52:33 UTC 2024

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

Log Message:
abseil: fix NetBSD 9 build

Conditionalize use of DT_GNU_HASH, which is not in elf.h in -9.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/abseil/distinfo
cvs rdiff -u -r0 -r1.4 \
    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.25 pkgsrc/devel/abseil/distinfo:1.26
--- pkgsrc/devel/abseil/distinfo:1.25   Tue Aug  6 13:20:22 2024
+++ pkgsrc/devel/abseil/distinfo        Sun Aug 18 13:52:33 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.25 2024/08/06 13:20:22 wiz Exp $
+$NetBSD: distinfo,v 1.26 2024/08/18 13:52:33 bsiegert Exp $
 
 BLAKE2s (abseil-20240722.0-20240722.0.tar.gz) = 101081b3c74fb21327d08577b9de82353a7548cae069af0b256d10fb56edbac7
 SHA512 (abseil-20240722.0-20240722.0.tar.gz) = bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
 Size (abseil-20240722.0-20240722.0.tar.gz) = 2242861 bytes
 SHA1 (patch-absl_base_internal_sysinfo.cc) = c96dd302dde0f6071a8353a5877a3bac37949467
+SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = 4165ab657a03194a5266815440f40cf4aa958f7b
 SHA1 (patch-absl_debugging_internal_vdso__support.cc) = 2292c5b0f2b41679039a1697508343ff5b6cc401
 SHA1 (patch-absl_time_internal_cctz_src_time__zone__format.cc) = 7f3b84cd63f847ffa4c2fcb04b28d1535ea1454b

Added files:

Index: pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc
diff -u /dev/null pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc:1.4
--- /dev/null   Sun Aug 18 13:52:33 2024
+++ pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_elf__mem__image.cc        Sun Aug 18 13:52:33 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-absl_debugging_internal_elf__mem__image.cc,v 1.4 2024/08/18 13:52:33 bsiegert 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
++++ absl/debugging/internal/elf_mem_image.cc
+@@ -225,9 +225,11 @@ void ElfMemImage::Init(const void *base)
+       case DT_HASH:
+         sysv_hash = reinterpret_cast<uint32_t *>(value);
+         break;
++#ifdef DT_GNU_HASH
+       case DT_GNU_HASH:
+         gnu_hash = reinterpret_cast<uint32_t *>(value);
+         break;
++#endif
+       case DT_SYMTAB:
+         dynsym_ = reinterpret_cast<ElfW(Sym) *>(value);
+         break;