CVS commit: pkgsrc/devel/gperftools

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 25 16:38:42 UTC 2023

Modified Files:
        pkgsrc/devel/gperftools: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/devel/gperftools/patches: patch-configure
            patch-src_base_sysinfo.cc
Removed Files:
        pkgsrc/devel/gperftools/patches:
            patch-src_base_atomicops-internals-arm-v6plus.h

Log Message:
gperftools: updated to 2.12

gperftools-2.12

Brett T. Warden contributed one significant fix. After a change in the previous release, we installed broken pkg-config files. Brett noticed and fixed that. Huge thanks!

gperftools-2.11

Few minor fixes since rc couple weeks ago. Plus couple notable contributions:

Artem Polyakov has contributed auto-detection of several MPI systems w.r.t. filenames used by HEAPPROFILE and CPUPROFILE environment variables. Also, we now support HEAPPROFILE_USE_PID and 
CPUPROFILE_USE_PID environment variables that force profile filenames to have pid appended. Which will be useful for some programs that fork for parallelism.

Ken Raffenetti has extended MPI detection mentioned above with detection of MPICH system.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/gperftools/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gperftools/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gperftools/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/gperftools/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gperftools/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gperftools/patches/patch-src_base_atomicops-internals-arm-v6plus.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gperftools/patches/patch-src_base_sysinfo.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/gperftools/Makefile
diff -u pkgsrc/devel/gperftools/Makefile:1.23 pkgsrc/devel/gperftools/Makefile:1.24
--- pkgsrc/devel/gperftools/Makefile:1.23       Fri Jul 22 08:34:45 2022
+++ pkgsrc/devel/gperftools/Makefile    Fri Aug 25 16:38:42 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2022/07/22 08:34:45 adam Exp $
+# $NetBSD: Makefile,v 1.24 2023/08/25 16:38:42 adam Exp $
 
-DISTNAME=      gperftools-2.10
+DISTNAME=      gperftools-2.12
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gperftools/}
 GITHUB_RELEASE=        ${DISTNAME}

Index: pkgsrc/devel/gperftools/PLIST
diff -u pkgsrc/devel/gperftools/PLIST:1.6 pkgsrc/devel/gperftools/PLIST:1.7
--- pkgsrc/devel/gperftools/PLIST:1.6   Wed Dec 16 19:22:18 2020
+++ pkgsrc/devel/gperftools/PLIST       Fri Aug 25 16:38:42 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/12/16 19:22:18 otis Exp $
+@comment $NetBSD: PLIST,v 1.7 2023/08/25 16:38:42 adam Exp $
 bin/pprof
 bin/pprof-symbolize
 include/google/heap-checker.h
@@ -34,18 +34,15 @@ lib/pkgconfig/libtcmalloc_minimal_debug.
 man/man1/pprof.1
 share/doc/gperftools/AUTHORS
 share/doc/gperftools/COPYING
-share/doc/gperftools/ChangeLog
 share/doc/gperftools/ChangeLog.old
 share/doc/gperftools/INSTALL
 share/doc/gperftools/NEWS
 share/doc/gperftools/README
 share/doc/gperftools/README_windows.txt
-share/doc/gperftools/TODO
 share/doc/gperftools/cpuprofile-fileformat.html
 share/doc/gperftools/cpuprofile.html
 share/doc/gperftools/designstyle.css
 share/doc/gperftools/heap-example1.png
-share/doc/gperftools/heap_checker.html
 share/doc/gperftools/heapprofile.html
 share/doc/gperftools/index.html
 share/doc/gperftools/overview.dot

Index: pkgsrc/devel/gperftools/buildlink3.mk
diff -u pkgsrc/devel/gperftools/buildlink3.mk:1.2 pkgsrc/devel/gperftools/buildlink3.mk:1.3
--- pkgsrc/devel/gperftools/buildlink3.mk:1.2   Tue Jun 28 11:31:44 2022
+++ pkgsrc/devel/gperftools/buildlink3.mk       Fri Aug 25 16:38:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/06/28 11:31:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2023/08/25 16:38:42 adam Exp $
 
 BUILDLINK_TREE+=       gperftools
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gperftools
 GPERFTOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gperftools+=     gperftools>=2.4
-BUILDLINK_ABI_DEPENDS.gperftools?=     gperftools>=2.9.1nb2
+BUILDLINK_ABI_DEPENDS.gperftools+=     gperftools>=2.9.1nb2
 BUILDLINK_PKGSRCDIR.gperftools?=       ../../devel/gperftools
 .endif # GPERFTOOLS_BUILDLINK3_MK
 

Index: pkgsrc/devel/gperftools/distinfo
diff -u pkgsrc/devel/gperftools/distinfo:1.18 pkgsrc/devel/gperftools/distinfo:1.19
--- pkgsrc/devel/gperftools/distinfo:1.18       Sun Sep 18 19:28:23 2022
+++ pkgsrc/devel/gperftools/distinfo    Fri Aug 25 16:38:42 2023
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.18 2022/09/18 19:28:23 he Exp $
+$NetBSD: distinfo,v 1.19 2023/08/25 16:38:42 adam Exp $
 
-BLAKE2s (gperftools-2.10.tar.gz) = 0b1ef9adbf32500a03e3e480da29e1192ebc66a737a5e18b5ad17c33c216bb0b
-SHA512 (gperftools-2.10.tar.gz) = 81f3b913e76641c6e51cdfe741fd0028bf9237e3e0f3937ea692ff420c8d006ee01be220417833e55809514fb88eeb0b695fa0a2cac614e60234b8c019a6e92a
-Size (gperftools-2.10.tar.gz) = 1616679 bytes
-SHA1 (patch-configure) = b6c1c33aa83ae3dbf80a0b6e8e0076378ee0aa08
-SHA1 (patch-src_base_atomicops-internals-arm-v6plus.h) = b3aeddd10d2506192551485570c31c0b3ff02432
+BLAKE2s (gperftools-2.12.tar.gz) = 5cace769a041823a97578363a2528269dd8ce13d28ff0b8c5210ad1c0331a8c5
+SHA512 (gperftools-2.12.tar.gz) = 36ba751d0a8162a6ec18580716112860960c79460191031952e64553ba7371df33038ba7a915f9fe94835fb3a9d973a43423d50ed52c9a86a88cfa240abc155f
+Size (gperftools-2.12.tar.gz) = 1498786 bytes
+SHA1 (patch-configure) = 1ff0ea42642f42d1ba6459c35c36f6db0e008007
 SHA1 (patch-src_base_basictypes.h) = 259488af84dcd7bc2114acdb3943d193b743ddb2
-SHA1 (patch-src_base_sysinfo.cc) = 558034b05ad3d2870a7269762d3b58442824e649
+SHA1 (patch-src_base_sysinfo.cc) = 8d3c4cbc930c8625e0aca9aba6bba3a35b80fbd5
 SHA1 (patch-src_symbolize.cc) = fdbc603dba286b45d092c3447b80a537549bd78d

Index: pkgsrc/devel/gperftools/patches/patch-configure
diff -u pkgsrc/devel/gperftools/patches/patch-configure:1.2 pkgsrc/devel/gperftools/patches/patch-configure:1.3
--- pkgsrc/devel/gperftools/patches/patch-configure:1.2 Wed Jan 20 15:12:56 2021
+++ pkgsrc/devel/gperftools/patches/patch-configure     Fri Aug 25 16:38:42 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.2 2021/01/20 15:12:56 adam Exp $
+$NetBSD: patch-configure,v 1.3 2023/08/25 16:38:42 adam Exp $
 
 Add support for NetBSD arm.
 
---- configure.orig     2015-01-10 20:20:33.000000000 +0000
+--- configure.orig     2023-08-24 18:55:19.000000000 +0000
 +++ configure
-@@ -17334,6 +17334,7 @@ $as_echo_n "checking how to access the p
-    pc_fields="$pc_fields uc_mcontext.mc_rip"           # FreeBSD (x86_64 [untested])
+@@ -18458,6 +18458,7 @@ printf %s "checking how to access the pr
+    pc_fields="$pc_fields uc_mcontext.mc_rip"           # FreeBSD (x86_64)
     pc_fields="$pc_fields uc_mcontext.__gregs[_REG_EIP]"  # NetBSD (i386)
     pc_fields="$pc_fields uc_mcontext.__gregs[_REG_RIP]"  # NetBSD (x86_64)
 +   pc_fields="$pc_fields uc_mcontext.__gregs[_REG_PC]"   # NetBSD (arm)

Index: pkgsrc/devel/gperftools/patches/patch-src_base_sysinfo.cc
diff -u pkgsrc/devel/gperftools/patches/patch-src_base_sysinfo.cc:1.1 pkgsrc/devel/gperftools/patches/patch-src_base_sysinfo.cc:1.2
--- pkgsrc/devel/gperftools/patches/patch-src_base_sysinfo.cc:1.1       Thu Nov 28 12:19:58 2019
+++ pkgsrc/devel/gperftools/patches/patch-src_base_sysinfo.cc   Fri Aug 25 16:38:42 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_base_sysinfo.cc,v 1.1 2019/11/28 12:19:58 bouyer Exp $
+$NetBSD: patch-src_base_sysinfo.cc,v 1.2 2023/08/25 16:38:42 adam Exp $
 
 Get mappings from procfs on NetBSD
 
---- src/base/sysinfo.cc.orig   2017-11-28 15:38:09.000000000 +0100
-+++ src/base/sysinfo.cc        2019-11-27 19:01:54.000000000 +0100
-@@ -47,7 +47,7 @@
+--- src/base/sysinfo.cc.orig   2023-08-11 19:32:36.000000000 +0000
++++ src/base/sysinfo.cc
+@@ -54,7 +54,7 @@
  #include <mach-o/loader.h>    // for iterating over dll's in ProcMapsIter
  #include <sys/types.h>
  #include <sys/sysctl.h>       // how we figure out numcpu's on OS X
@@ -13,25 +13,7 @@ Get mappings from procfs on NetBSD
  #include <sys/sysctl.h>
  #elif defined __sun__         // Solaris
  #include <procfs.h>           // for, e.g., prmap_t
-@@ -273,7 +273,7 @@
- 
- // ----------------------------------------------------------------------
- 
--#if defined __linux__ || defined __FreeBSD__ || defined __sun__ || defined __CYGWIN__ || defined __CYGWIN32__
-+#if defined __linux__ || defined __FreeBSD__ || defined __sun__ || defined __CYGWIN__ || defined __CYGWIN32__ || defined __NetBSD__
- static void ConstructFilename(const char* spec, pid_t pid,
-                               char* buf, int buf_size) {
-   CHECK_LT(snprintf(buf, buf_size,
-@@ -425,7 +425,7 @@
-                               char *flags, uint64 *offset,
-                               int *major, int *minor, int64 *inode,
-                               unsigned *filename_offset) {
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__NetBSD__)
-   /*
-    * It's similar to:
-    * sscanf(text, "%"SCNx64"-%"SCNx64" %4s %"SCNx64" %x:%x %"SCNd64" %n",
-@@ -518,6 +518,13 @@
+@@ -582,6 +582,13 @@ void ProcMapsIterator::Init(pid_t pid, B
      ConstructFilename("/proc/%d/map", pid, ibuf_, Buffer::kBufSize);
    }
    NO_INTR(fd_ = open(ibuf_, O_RDONLY));
@@ -45,21 +27,3 @@ Get mappings from procfs on NetBSD
  #elif defined(__sun__)
    if (pid == 0) {
      ConstructFilename("/proc/self/map", 1, ibuf_, Buffer::kBufSize);
-@@ -575,7 +582,7 @@
-                                uint64 *anon_mapping, uint64 *anon_pages,
-                                dev_t *dev) {
- 
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__CYGWIN32__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined __NetBSD__
-   do {
-     // Advance to the start of the next line
-     stext_ = nextline_;
-@@ -615,7 +622,7 @@
-     int64 tmpinode;
-     int major, minor;
-     unsigned filename_offset = 0;
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__NetBSD__)
-     // for now, assume all linuxes have the same format
-     if (!ParseProcMapsLine(
-         stext_,