<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd2dc2f2c4de20004f72cd8aa08ba6247ac3e6f6">https://github.com/macports/macports-ports/commit/cd2dc2f2c4de20004f72cd8aa08ba6247ac3e6f6</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 cd2dc2f2c4d gperftools: fix cmake arm detection logic See: https://trac.macports.org/ticket/67572
</span>cd2dc2f2c4d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd2dc2f2c4de20004f72cd8aa08ba6247ac3e6f6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jun 6 12:01:01 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gperftools: fix cmake arm detection logic
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/67572
</span>---
devel/gperftools/Portfile | 4 +++
.../gperftools/files/patch-cmake-arm64-detect.diff | 30 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
<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 5bb96594fd4..e1c4e812819 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;'>@@ -23,6 +23,10 @@ checksums rmd160 54e35f78813b5409bc6f82e0894b0b8e42ad711a \
</span> # Patch to replace use of std::random_shuffle, removed in Cxx 2017 and later
patchfiles-append patch-malloc_bench-random_shuffle.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to fix ARM detection, for CMake. Already present for autotools-based builds.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/67572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake-arm64-detect.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append patch-rosetta.diff
compiler.cxx_standard 2017
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3f7f549f335
</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-cmake-arm64-detect.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to fix ARM detection, for CMake. Upstream already has these for autotools-based builds,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# but hasn't added these for CMake yet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/67572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/DefineTargetVariables.cmake.orig 2023-06-06 11:49:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/DefineTargetVariables.cmake 2023-06-06 11:49:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_source_compiles("int main() { return __s390__; }" s390)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_source_compiles("int main() { return __PPC64__; }" PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_source_compiles("int main() { return __x86_64__; }" x86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- check_cxx_source_compiles("int main() { return __arm__; }" ARM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ check_cxx_source_compiles("int main() { return __arm64__; }" ARM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_source_compiles("int main() { return __FreeBSD__; }" FreeBSD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_source_compiles("int main() { return __MINGW__; }" MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_source_compiles("int main() { return __linux; }" LINUX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/PCFromUContext.cmake.orig 2023-06-06 11:40:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/PCFromUContext.cmake 2023-06-06 11:45:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "uc_mcontext->ss.rip" # OS X (x86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "uc_mcontext->__ss.__rip" # OS X (>=10.5 [untested])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "uc_mcontext->ss.srr0" # OS X (ppc, ppc64 [untested])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "uc_mcontext->__ss.__srr0") # OS X (>=10.5 [untested])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "uc_mcontext->__ss.__srr0" # OS X (>=10.5 [untested])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "uc_mcontext->__ss.__pc" # OS X (arm64)
</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;'>+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HAVE_CYGWIN_SIGNAL_H)
</span></pre><pre style='margin:0'>
</pre>