CVS commit: pkgsrc/devel/abseil

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Mar 26 22:50:19 UTC 2022

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

Log Message:
abseil: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/abseil/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.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.11 pkgsrc/devel/abseil/distinfo:1.12
--- pkgsrc/devel/abseil/distinfo:1.11   Sun Mar  6 09:34:06 2022
+++ pkgsrc/devel/abseil/distinfo        Sat Mar 26 22:50:18 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2022/03/06 09:34:06 wiz Exp $
+$NetBSD: distinfo,v 1.12 2022/03/26 22:50:18 tnn Exp $
 
 BLAKE2s (abseil-20211102.0-20211102.0.tar.gz) = a4d9e13332297a49cc2c2e17c4123afb184fe7d23e2c564587e42b95411570b9
 SHA512 (abseil-20211102.0-20211102.0.tar.gz) = fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
 Size (abseil-20211102.0-20211102.0.tar.gz) = 1884080 bytes
 SHA1 (patch-absl_base_config.h) = 3d72772dc00b95fcad3d36230b6e3145a6a41e7c
 SHA1 (patch-absl_debugging_internal_elf__mem__image.cc) = b1ce3fda13188cd9b3a9096e243bae7142d1c67c
-SHA1 (patch-absl_debugging_internal_vdso__support.cc) = decf624b29f1db9acd127c4c629fdf9e9bc2b38c
+SHA1 (patch-absl_debugging_internal_vdso__support.cc) = 112d7c0d1b041cefaa9866de40031b28aa6575fa
 SHA1 (patch-absl_time_internal_cctz_src_time__zone__format.cc) = 501736490edc62afb8b82e16f9a88e7fab6f5552

Index: pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc
diff -u pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc:1.2 pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc:1.3
--- pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc:1.2      Sun Mar  6 09:34:06 2022
+++ pkgsrc/devel/abseil/patches/patch-absl_debugging_internal_vdso__support.cc  Sat Mar 26 22:50:18 2022
@@ -1,9 +1,10 @@
-$NetBSD: patch-absl_debugging_internal_vdso__support.cc,v 1.2 2022/03/06 09:34:06 wiz Exp $
+$NetBSD: patch-absl_debugging_internal_vdso__support.cc,v 1.3 2022/03/26 22:50:18 tnn Exp $
 
 Support NetBSD.
 https://github.com/abseil/abseil-cpp/pull/1121
+No support for SunOS yet, so disable for the time being.
 
---- absl/debugging/internal/vdso_support.cc.orig       2021-11-18 10:00:05.006467401 +0000
+--- absl/debugging/internal/vdso_support.cc.orig       2021-11-03 15:26:14.000000000 +0000
 +++ absl/debugging/internal/vdso_support.cc
 @@ -50,6 +50,10 @@
  #define AT_SYSINFO_EHDR 33  // for crosstoolv10
@@ -16,7 +17,17 @@ https://github.com/abseil/abseil-cpp/pul
  #if defined(__FreeBSD__)
  using Elf64_auxv_t = Elf64_Auxinfo;
  using Elf32_auxv_t = Elf32_Auxinfo;
-@@ -104,8 +108,13 @@ const void *VDSOSupport::Init() {
+@@ -93,6 +97,9 @@ const void *VDSOSupport::Init() {
+     }
+   }
+ #endif  // ABSL_HAVE_GETAUXVAL
++#if defined(__sun)
++      return nullptr;
++#else // !__sun
+   if (vdso_base_.load(std::memory_order_relaxed) == kInvalidBase) {
+     int fd = open("/proc/self/auxv", O_RDONLY);
+     if (fd == -1) {
+@@ -104,8 +111,13 @@ const void *VDSOSupport::Init() {
      ElfW(auxv_t) aux;
      while (read(fd, &aux, sizeof(aux)) == sizeof(aux)) {
        if (aux.a_type == AT_SYSINFO_EHDR) {
@@ -30,3 +41,11 @@ https://github.com/abseil/abseil-cpp/pul
          break;
        }
      }
+@@ -127,6 +139,7 @@ const void *VDSOSupport::Init() {
+   // from assigning to getcpu_fn_ more than once.
+   getcpu_fn_.store(fn, std::memory_order_relaxed);
+   return vdso_base_.load(std::memory_order_relaxed);
++#endif // __sun
+ }
+ 
+ const void *VDSOSupport::SetBase(const void *base) {