<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4547c0e5d650d00ef81f0b9fc18272bf404ccdbb">https://github.com/macports/macports-ports/commit/4547c0e5d650d00ef81f0b9fc18272bf404ccdbb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4547c0e5d65 gperftools: update to 2.15, fix tests target for CMake build
</span>4547c0e5d65 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4547c0e5d650d00ef81f0b9fc18272bf404ccdbb
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Jan 10 00:36:26 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> gperftools: update to 2.15, fix tests target for CMake build
</span>---
devel/gperftools/Portfile | 27 +++++++++----------
...-check_address_test.cc-missed-MAP_ANON-fix.diff | 24 +++++++++++++++++
.../gperftools/files/patch-cmake-arm64-detect.diff | 30 ----------------------
.../files/patch-malloc_bench-random_shuffle.diff | 26 -------------------
devel/gperftools/files/patch-rosetta.diff | 15 -----------
5 files changed, 36 insertions(+), 86 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/Portfile b/devel/gperftools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1c4e812819..e977f41277b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperftools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gperftools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gperftools gperftools 2.10 gperftools-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gperftools gperftools 2.15 gperftools-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories devel
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,18 +16,11 @@ long_description gperftools is a collection of a high-performance multi-threa
</span>
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 54e35f78813b5409bc6f82e0894b0b8e42ad711a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 83e3bfdd28b8bcf53222c3798d4d395d52dadbbae59e8730c4a6d31a9c3732d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1616679
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3ed3b444c010ce1b13cec85dc3efc142c0a61074 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c69fef855628c81ef56f12e3c58f2b7ce1f326c0a1fe783e5cae0b88cbbe9a80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1511014
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to replace use of std::random_shuffle, removed in Cxx 2017 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-malloc_bench-random_shuffle.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix ARM detection, for CMake. Already present for autotools-based builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/67572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmake-arm64-detect.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-rosetta.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-check_address_test.cc-missed-MAP_ANON-fix.diff
</span>
compiler.cxx_standard 2017
cmake.set_cxx_standard yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,12 +44,16 @@ variant benchmark description {Enable benchmark support} {
</span> -Dgperftools_build_benchmark:BOOL=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: Add check to verify that port is already installed first, otherwise fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# A number of tests fail, similarly for all archs (arm64, x86_64, ppc):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/gperftools/gperftools/issues/1477
</span> variant tests description {Enable test support} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</span> configure.args-replace \
-DBUILD_TESTING:BOOL=OFF \
-DBUILD_TESTING:BOOL=ON
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target test
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/files/patch-check_address_test.cc-missed-MAP_ANON-fix.diff b/devel/gperftools/files/patch-check_address_test.cc-missed-MAP_ANON-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b787a147f2e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gperftools/files/patch-check_address_test.cc-missed-MAP_ANON-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5eda3fbb44340a089440a809b3b771e4de4cf08f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 9 Jan 2024 23:51:06 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] check_address_test.cc: missed MAP_ANON fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tests/check_address_test.cc | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tests/check_address_test.cc src/tests/check_address_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c230c5..885a498 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tests/check_address_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tests/check_address_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +44,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef FORCE_PIPES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef MAP_ANONYMOUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define MAP_ANONYMOUS MAP_ANON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tests/testutil.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* unreadable = mmap(0, getpagesize(), PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/files/patch-cmake-arm64-detect.diff b/devel/gperftools/files/patch-cmake-arm64-detect.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f7f549f335..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperftools/files/patch-cmake-arm64-detect.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix ARM detection, for CMake. Upstream already has these for autotools-based builds,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# but hasn't added these for CMake yet.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/67572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/DefineTargetVariables.cmake.orig 2023-06-06 11:49:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/DefineTargetVariables.cmake 2023-06-06 11:49:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles("int main() { return __s390__; }" s390)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles("int main() { return __PPC64__; }" PPC64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles("int main() { return __x86_64__; }" x86_64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- check_cxx_source_compiles("int main() { return __arm__; }" ARM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ check_cxx_source_compiles("int main() { return __arm64__; }" ARM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles("int main() { return __FreeBSD__; }" FreeBSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles("int main() { return __MINGW__; }" MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_source_compiles("int main() { return __linux; }" LINUX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/PCFromUContext.cmake.orig 2023-06-06 11:40:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/PCFromUContext.cmake 2023-06-06 11:45:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "uc_mcontext->ss.rip" # OS X (x86_64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "uc_mcontext->__ss.__rip" # OS X (>=10.5 [untested])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "uc_mcontext->ss.srr0" # OS X (ppc, ppc64 [untested])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "uc_mcontext->__ss.__srr0") # OS X (>=10.5 [untested])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "uc_mcontext->__ss.__srr0" # OS X (>=10.5 [untested])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "uc_mcontext->__ss.__pc" # OS X (arm64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_CYGWIN_SIGNAL_H)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/files/patch-malloc_bench-random_shuffle.diff b/devel/gperftools/files/patch-malloc_bench-random_shuffle.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8b89d5f545a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperftools/files/patch-malloc_bench-random_shuffle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to replace use of std::random_shuffle - removed in Cxx 2017 and later - with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# official replacement: std::shuffle, along with an explicit random device source.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- benchmark/malloc_bench.cc.orig 2023-06-04 11:06:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ benchmark/malloc_bench.cc 2023-06-04 11:08:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <random>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "run_benchmark.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +234,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < count; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- randomize_buffer[i] = malloc(size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::random_shuffle(randomize_buffer, randomize_buffer + count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // https://en.cppreference.com/w/cpp/algorithm/random_shuffle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::random_device rd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::mt19937 g(rd());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::shuffle(randomize_buffer, randomize_buffer + count, g);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < count; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(randomize_buffer[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gperftools/files/patch-rosetta.diff b/devel/gperftools/files/patch-rosetta.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9148fe7ecf1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gperftools/files/patch-rosetta.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libc_override_osx.h.orig 2021-12-13 14:28:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libc_override_osx.h 2023-01-19 20:14:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -276,9 +276,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Switch to version 6 on OSX 10.6 to support memalign.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tcmalloc_zone.version = 6;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tcmalloc_zone.free_definite_size = &mz_free_definite_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tcmalloc_zone.memalign = &mz_memalign;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __POWERPC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tcmalloc_zone.free_definite_size = &mz_free_definite_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tcmalloc_introspection.zone_locked = &mi_zone_locked;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Request the default purgable zone to force its creation. The
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // current default zone is registered with the purgable zone for
</span></pre><pre style='margin:0'>
</pre>