<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0f962c4707ee3302a92cdc64e37d0a931cad687e">https://github.com/macports/macports-ports/commit/0f962c4707ee3302a92cdc64e37d0a931cad687e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0f962c4707ee3302a92cdc64e37d0a931cad687e
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jan 3 07:45:36 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> folly: update to 2023.01.02.00
</span>---
...cmake-do-not-require-c-abi-with-GCC-on-Ap.patch | 25 +++
...stems.diff => 0002-Fixes-for-older-macOS.patch} | 243 ++++++++++++---------
devel/folly/files/0003-Fixes-for-macOS-PPC.patch | 115 ++++++++++
devel/folly/files/patch-cmakelists.diff | 32 ---
devel/folly/files/patch-darwin-ppc.diff | 79 -------
5 files changed, 277 insertions(+), 217 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/0001-folly-deps.cmake-do-not-require-c-abi-with-GCC-on-Ap.patch b/devel/folly/files/0001-folly-deps.cmake-do-not-require-c-abi-with-GCC-on-Ap.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3da1a13739c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/folly/files/0001-folly-deps.cmake-do-not-require-c-abi-with-GCC-on-Ap.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0e59b7ecf2b0ba056b520053f9ad3802033ede52 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 3 Jan 2023 04:23:03 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] folly-deps.cmake: do not require c++abi with GCC on Apple
</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;'>+ CMake/folly-deps.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 989259a87..c04634b1f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMake/folly-deps.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMake/folly-deps.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,7 +247,7 @@ check_cxx_source_compiles("
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOLLY_STDLIB_LIBCPP
</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;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (APPLE AND NOT(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list (APPEND CMAKE_REQUIRED_LIBRARIES c++abi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list (APPEND FOLLY_LINK_LIBRARIES c++abi)
</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;'>+2.39.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/patch-older-systems.diff b/devel/folly/files/0002-Fixes-for-older-macOS.patch
</span>similarity index 51%
rename from devel/folly/files/patch-older-systems.diff
rename to devel/folly/files/0002-Fixes-for-older-macOS.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4756d30ac72..de546856f8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/files/patch-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/folly/files/0002-Fixes-for-older-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/macports/macports-ports/pull/15689#issuecomment-1211163024
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/facebook/folly/issues/1833
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- folly/File.cpp.orig 2022-07-30 03:08:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/File.cpp 2022-08-11 19:15:42.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,8 +120,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ecf08bc56151923b1539b508f4984baf19db8b4e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 3 Jan 2023 04:07:54 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] Fixes for older macOS
</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;'>+ folly/File.cpp | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/SocketAddress.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/io/async/AsyncServerSocket.cpp | 12 ++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/io/async/AsyncUDPSocket.cpp | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/net/TcpInfoTypes.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/portability/Time.cpp | 24 +++++++++++++++++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/system/ThreadId.cpp | 14 +++++++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7 files changed, 62 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/File.cpp b/folly/File.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 401eb7a01..d34a67f30 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/File.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/File.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,8 +120,10 @@ File File::dupCloseOnExec() const {
</span> int fd;
#ifdef _WIN32
fd = ::dup(fd_);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,13 +29,97 @@
</span> #endif
checkUnixError(fd, "dup() failed");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TASK_INFO: https://github.com/bear-metal/tunemygc/commit/9652a759ab4eba7caa7a333383ebd7461e3040cf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID be borrowed?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://opensource.apple.com/source/Libc/Libc-1158.50.2/gen/clock_gettime.c.auto.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- folly/portability/Time.cpp.orig 2022-07-30 03:08:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/portability/Time.cpp 2022-08-12 00:53:36.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,11 +37,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/SocketAddress.cpp b/folly/SocketAddress.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2fb1fac9e..fe6231183 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/SocketAddress.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/SocketAddress.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,6 +125,10 @@ struct GetAddrInfoError {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace folly {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AI_NUMERICSERV 0
</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;'>+ bool SocketAddress::isPrivateAddress() const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto family = getFamily();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (family == AF_INET || family == AF_INET6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/io/async/AsyncServerSocket.cpp b/folly/io/async/AsyncServerSocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 127c88e75..796d77380 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/io/async/AsyncServerSocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/io/async/AsyncServerSocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,18 @@ namespace folly {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TCP_SAVED_SYN 28
</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 AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AI_NUMERICSERV 0
</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 IPV6_TCLASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNU__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IPV6_TCLASS 61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IPV6_TCLASS 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ static constexpr bool msgErrQueueSupported =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef FOLLY_HAVE_MSG_ERRQUEUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 24477baad..7ed5d9d08 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/io/async/AsyncUDPSocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/io/async/AsyncUDPSocket.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SO_REUSEPORT 15
</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 IPV6_TCLASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNU__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IPV6_TCLASS 61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IPV6_TCLASS 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ #if FOLLY_HAVE_VLA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FOLLY_HAVE_VLA_01 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,6 +265,7 @@ void AsyncUDPSocket::init(sa_family_t family, BindOptions bindOptions) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "failed to set IPV6_RECVTCLASS on the socket",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef IP_RECVTOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (family == AF_INET) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (netops::setsockopt(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ socket, IPPROTO_IP, IP_RECVTOS, &flag, sizeof(flag)) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,6 +274,7 @@ void AsyncUDPSocket::init(sa_family_t family, BindOptions bindOptions) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "failed to set IP_RECVTOS on the socket",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/net/TcpInfoTypes.h b/folly/net/TcpInfoTypes.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 09a8a9907..d3a6caac4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/net/TcpInfoTypes.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/net/TcpInfoTypes.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@ struct tcp_info_legacy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __u32 tcpi_total_retrans;
</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;'>+-#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 101003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FOLLY_HAVE_TCP_INFO 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using tcp_info = ::tcp_connection_info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int tcp_info_sock_opt = TCP_CONNECTION_INFO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/portability/Time.cpp b/folly/portability/Time.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 88f00150f..3f882b473 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/portability/Time.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/portability/Time.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,11 +37,13 @@ static void duration_to_ts(
</span> #if !FOLLY_HAVE_CLOCK_GETTIME || FOLLY_FORCE_CLOCK_GETTIME_DEFINITION
#if __MACH__
#include <errno.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +133,7 @@
</span> #include <mach/thread_act.h> // @manual
#include <mach/vm_map.h> // @manual
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +66,7 @@ static int clock_process_cputime(struct timespec* ts) {
</span> }
// Get CPU usage for terminated threads.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +141,7 @@
</span> mach_task_basic_info task_basic_info;
mach_msg_type_number_t task_basic_info_count = MACH_TASK_BASIC_INFO_COUNT;
kern_result = task_info(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +77,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,6 +77,18 @@ static int clock_process_cputime(struct timespec* ts) {
</span> if (UNLIKELY(kern_result != KERN_SUCCESS)) {
return -1;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +160,7 @@
</span>
auto cputime = time_value_to_ns(thread_times_info.user_time) +
time_value_to_ns(thread_times_info.system_time) +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,6 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,6 +114,7 @@ static int clock_thread_cputime(struct timespec* ts) {
</span> return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +168,7 @@
</span> FOLLY_ATTR_WEAK int clock_gettime(clockid_t clk_id, struct timespec* ts) {
switch (folly::to_underlying(clk_id)) {
case CLOCK_REALTIME: {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,6 +136,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,6 +136,7 @@ FOLLY_ATTR_WEAK int clock_gettime(clockid_t clk_id, struct timespec* ts) {
</span> return -1;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +176,7 @@
</span>
int clock_getres(clockid_t clk_id, struct timespec* ts) {
if (clk_id != CLOCK_MONOTONIC) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,6 +207,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,6 +207,7 @@ extern "C" int clock_getres(clockid_t clock_id, struct timespec* res) {
</span> res->tv_nsec = time_t(perSec * kNsPerSec);
return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +184,7 @@
</span> case CLOCK_PROCESS_CPUTIME_ID:
case CLOCK_THREAD_CPUTIME_ID: {
DWORD adj, timeIncrement;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,12 +216,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,12 +216,11 @@ extern "C" int clock_getres(clockid_t clock_id, struct timespec* res) {
</span> errno = EINVAL;
return -1;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +198,7 @@
</span> default:
errno = EINVAL;
return -1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,6 +253,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,6 +253,7 @@ extern "C" int clock_gettime(clockid_t clock_id, struct timespec* tp) {
</span> duration_to_ts(now, tp);
return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +206,7 @@
</span> case CLOCK_PROCESS_CPUTIME_ID: {
if (!GetProcessTimes(
GetCurrentProcess(),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +286,7 @@ extern "C" int clock_gettime(clockid_t clock_id, struct timespec* tp) {
</span> filetimeToUnsignedNanos(kernalTime) +
filetimeToUnsignedNanos(userTime));
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,99 +215,31 @@
</span> default:
errno = EINVAL;
return -1;
<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;'>---- folly/system/ThreadId.cpp.orig 2022-07-30 03:08:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/system/ThreadId.cpp 2022-08-12 00:37:48.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,9 +40,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/system/ThreadId.cpp b/folly/system/ThreadId.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e426b39e1..b297d671f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/system/ThreadId.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/system/ThreadId.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,9 +40,17 @@ namespace detail {
</span>
uint64_t getOSThreadIDSlow() {
#if __APPLE__
- uint64_t tid;
- pthread_threadid_np(nullptr, &tid);
- return tid;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint64_t tid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint64_t tid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint64_t tid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_threadid_np(nullptr, &tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return tid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint64_t tid;
</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 < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint64_t tid;
</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;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint64_t tid;
</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;'>++ return tid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span> #elif defined(_WIN32)
return uint64_t(GetCurrentThreadId());
#elif defined(__FreeBSD__)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.39.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- folly/net/TcpInfoTypes.h.orig 2022-08-06 08:35:42.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/net/TcpInfoTypes.h 2022-08-14 19:19:26.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +179,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __u32 tcpi_total_retrans;
</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;'>--#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 101003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_HAVE_TCP_INFO 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using tcp_info = ::tcp_connection_info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int tcp_info_sock_opt = TCP_CONNECTION_INFO;
</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;'>---- folly/SocketAddress.cpp.orig 2022-08-06 09:35:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/SocketAddress.cpp 2022-10-06 15:11:49.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,6 +125,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace folly {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define AI_NUMERICSERV 0
</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;'>- bool SocketAddress::isPrivateAddress() const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto family = getFamily();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (family == AF_INET || family == AF_INET6) {
</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;'>---- folly/io/async/AsyncServerSocket.cpp.orig 2022-10-15 16:08:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/io/async/AsyncServerSocket.cpp 2022-10-15 15:59:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,6 +47,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TCP_SAVED_SYN 28
</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;'>-+#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define AI_NUMERICSERV 0
</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;'>-+#ifndef IPV6_TCLASS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__GNU__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define IPV6_TCLASS 61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define IPV6_TCLASS 36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- static constexpr bool msgErrQueueSupported =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef FOLLY_HAVE_MSG_ERRQUEUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- true;
</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;'>---- folly/io/async/AsyncUDPSocket.cpp.orig 2022-08-06 09:35:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/io/async/AsyncUDPSocket.cpp 2022-10-15 16:00:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SO_REUSEPORT 15
</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;'>-+#ifndef IPV6_TCLASS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__GNU__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define IPV6_TCLASS 61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define IPV6_TCLASS 36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- #if FOLLY_HAVE_VLA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_HAVE_VLA_01 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/0003-Fixes-for-macOS-PPC.patch b/devel/folly/files/0003-Fixes-for-macOS-PPC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..59e19b132bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/folly/files/0003-Fixes-for-macOS-PPC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,115 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4e933097037f8f47178ee27ee8161ad7ea0085b8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 3 Jan 2023 04:13:06 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] Fixes for macOS PPC
</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;'>+ CMakeLists.txt | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/Portability.h | 12 +++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/detail/base64_detail/Base64Api.cpp | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ folly/portability/Asm.h | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 30 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fab26959c..aca96e4a8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,6 +242,16 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</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;'>+ # base64 SIMD files compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STATUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "PowerPC Big Endian has a limited support, "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "skipping building Base64SWAR of base64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(REMOVE_ITEM files ${FOLLY_DIR}/detail/base64_detail/Base64SWAR.cpp)
</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;'>+ if (NOT(${IS_X86_64_ARCH}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STATUS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/Portability.h b/folly/Portability.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 83d68d26e..4d94c4a8a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/Portability.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/Portability.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,12 +103,18 @@ constexpr bool kHasUnalignedAccess = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FOLLY_AARCH64 0
</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;'>+-#if defined(__powerpc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__powerpc64__) || defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FOLLY_PPC64 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FOLLY_PPC64 0
</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;'>++#if defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FOLLY_PPC 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FOLLY_PPC 0
</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;'>+ #if defined(__s390x__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FOLLY_S390X 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,6 +126,7 @@ constexpr bool kIsArchArm = FOLLY_ARM == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr bool kIsArchAmd64 = FOLLY_X64 == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr bool kIsArchAArch64 = FOLLY_AARCH64 == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr bool kIsArchPPC64 = FOLLY_PPC64 == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++constexpr bool kIsArchPPC = FOLLY_PPC == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr bool kIsArchS390X = FOLLY_S390X == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // namespace folly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,6 +325,9 @@ constexpr auto kIsLittleEndian = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr auto kIsLittleEndian = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Darwin ppc/ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++constexpr auto kIsLittleEndian = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr auto kIsLittleEndian = __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/detail/base64_detail/Base64Api.cpp b/folly/detail/base64_detail/Base64Api.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c8493c06..1d4666ac5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/detail/base64_detail/Base64Api.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/detail/base64_detail/Base64Api.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,10 +31,16 @@ Base64RuntimeImpl base64EncodeSelectImplementation() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base64URLDecodeSWAR};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__POWERPC__) // PowerPC BE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ base64EncodeScalar,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ base64URLEncode};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else // Everything but PowerPC BE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base64EncodeScalar,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base64URLEncodeScalar,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base64DecodeSWAR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base64URLDecodeSWAR};
</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 folly::detail::base64_detail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/folly/portability/Asm.h b/folly/portability/Asm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aa1317296..93ef58d38 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/folly/portability/Asm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/folly/portability/Asm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,8 +41,10 @@ inline void asm_volatile_pause() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asm volatile("pause");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif FOLLY_AARCH64 || (defined(__arm__) && !(__ARM_ARCH < 7))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asm volatile("yield");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif FOLLY_PPC64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif FOLLY_PPC64 && !(defined(__APPLE__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asm volatile("or 27,27,27");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (FOLLY_PPC || FOLLY_PPC64) && defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __asm__ volatile ("or r27,r27,r27" ::: "memory");
</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 folly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.39.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/patch-cmakelists.diff b/devel/folly/files/patch-cmakelists.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 07183bb50b7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/files/patch-cmakelists.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig.txt 2022-07-30 03:08:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-08-11 21:23:56.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,6 +230,16 @@
</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;'>- # base64 SIMD files compilation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "ppc")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STATUS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "PowerPC Big Endian has a limited support, "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "skipping building Base64SWAR of base64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(REMOVE_ITEM files ${FOLLY_DIR}/detail/base64_detail/Base64SWAR.cpp)
</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;'>- if (${IS_X86_64_ARCH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATUS
</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;'>---- CMake/folly-deps.cmake.orig 2022-08-12 00:46:34.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMake/folly-deps.cmake 2022-08-12 00:33:29.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +247,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOLLY_STDLIB_LIBCPP
</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;'>--if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (APPLE AND NOT(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list (APPEND CMAKE_REQUIRED_LIBRARIES c++abi)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list (APPEND FOLLY_LINK_LIBRARIES c++abi)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/patch-darwin-ppc.diff b/devel/folly/files/patch-darwin-ppc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 79ab6ebe2bf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/files/patch-darwin-ppc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- folly/Portability.h.orig 2022-07-30 03:08:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/Portability.h 2022-08-10 23:12:09.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,12 +103,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_AARCH64 0
</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;'>--#if defined(__powerpc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__powerpc64__) || defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_PPC64 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_PPC64 0
</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;'>-+#if defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FOLLY_PPC 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FOLLY_PPC 0
</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;'>- #if defined(__s390x__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_S390X 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,6 +126,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr bool kIsArchAmd64 = FOLLY_X64 == 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr bool kIsArchAArch64 = FOLLY_AARCH64 == 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr bool kIsArchPPC64 = FOLLY_PPC64 == 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+constexpr bool kIsArchPPC = FOLLY_PPC == 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr bool kIsArchS390X = FOLLY_S390X == 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } // namespace folly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,6 +325,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr auto kIsLittleEndian = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Darwin ppc/ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+constexpr auto kIsLittleEndian = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr auto kIsLittleEndian = __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__;
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/mr-c/misc/wiki/pause-techniques-on-many-architectures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- folly/portability/Asm.h.orig 2022-07-30 03:08:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/portability/Asm.h 2022-08-10 23:07:57.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,8 +41,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asm volatile("pause");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif FOLLY_AARCH64 || (defined(__arm__) && !(__ARM_ARCH < 7))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asm volatile("yield");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif FOLLY_PPC64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif FOLLY_PPC64 && !(defined(__APPLE__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asm volatile("or 27,27,27");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif (FOLLY_PPC || FOLLY_PPC64) && defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ volatile ("or r27,r27,r27" ::: "memory");
</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;'>- } // namespace folly
</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;'>-# https://github.com/facebook/folly/issues/1834
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- folly/detail/base64_detail/Base64Api.cpp.orig 2022-08-14 12:11:09.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ folly/detail/base64_detail/Base64Api.cpp 2022-08-14 12:19:29.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,10 +31,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base64URLDecodeSWAR};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__POWERPC__) // PowerPC BE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base64EncodeScalar,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base64URLEncode};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else // Everything but PowerPC BE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base64EncodeScalar,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base64URLEncodeScalar,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base64DecodeSWAR,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base64URLDecodeSWAR};
</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;'>- } // namespace folly::detail::base64_detail
</span></pre><pre style='margin:0'>
</pre>