<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a3de50df69ebc6b601cac57c64ba54aa79bbc0d8">https://github.com/macports/macports-ports/commit/a3de50df69ebc6b601cac57c64ba54aa79bbc0d8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a3de50df69ebc6b601cac57c64ba54aa79bbc0d8
</span>Author: Vadym-Valdis Yudaiev <judaew@outlook.de>
AuthorDate: Tue Aug 15 23:54:45 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> abseil: update to 20230802.0 and add patch for pthread
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closed: https://trac.macports.org/ticket/67969
</span>---
devel/abseil/Portfile | 16 ++++++++++------
devel/abseil/files/patch-pthread.diff | 32 ++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/abseil/Portfile b/devel/abseil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2497f985573..218039bf4b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/abseil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/abseil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,11 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# MAP_ANONYMOUS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MAP_ANONYMOUS and clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span>
# Ports that depend on this port must be revbump after update.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup abseil abseil-cpp 20230125.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup abseil abseil-cpp 20230802.0
</span> name abseil
revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,12 +24,16 @@ long_description Abseil is an open-source collection of C++ library \
</span> Google's own C++ code base, has been extensively \
tested and used in production.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 18ea059168c7f8b5dbaeea433e71c57e9644b157 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0195e85f858b38f4563a6f2912e30bfc45dfad4815fbf97d273ed1cae9bbca94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2119590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dc95a6a1b741cce460d02c9d40bd332f6acdfdb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9b19d2f920105e9bee2a4741f63b4d25d987603e1345d2d8c54694f5bdff1a4e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2156696
</span>
patchfiles patch-remove-Xarch-from-pkg-config.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Abseil broken for 10.4-10.5, it's the pthread issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://github.com/macports/macports-ports/pull/19905#issuecomment-1679652939
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-pthread.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
if {${build_arch} in [list ppc ppc64]} {
patchfiles-append patch-darwin-ppc.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/abseil/files/patch-pthread.diff b/devel/abseil/files/patch-pthread.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..628ef5f628f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/abseil/files/patch-pthread.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- absl/base/internal/sysinfo.cc.orig 2023-08-07 21:40:00.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ absl/base/internal/sysinfo.cc 2023-08-16 00:59:00.596362110 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "absl/base/internal/unscaledcycleclock.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "absl/base/thread_annotations.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</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;'>+ namespace absl {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ABSL_NAMESPACE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace base_internal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,7 +432,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // `nullptr` here implies this thread. This only fails if the specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // thread is invalid or the pointer-to-tid is null, so we needn't worry about
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (&pthread_threadid_np) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pthread_threadid_np(nullptr, &tid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_threadid_np(nullptr, &tid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return static_cast<pid_t>(tid);
</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;'>+
</span></pre><pre style='margin:0'>
</pre>