<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb338f00ecbe0070ce26c4f550c134c416727b64">https://github.com/macports/macports-ports/commit/fb338f00ecbe0070ce26c4f550c134c416727b64</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 fb338f00ecb valkey: backport a fix from upstream
</span>fb338f00ecb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit fb338f00ecbe0070ce26c4f550c134c416727b64
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 23 12:16:13 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    valkey: backport a fix from upstream
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/70794
</span>---
 databases/valkey/Portfile                          |  6 +++-
 .../d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch | 32 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/Portfile b/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6184ff7776..beb0eaee6fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span> 
 github.setup        valkey-io valkey 8.0.0
 github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          databases
 license             BSD
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,10 @@ patchfiles          patch-valkey.conf.diff \
</span>                     patch-gh-12585.diff \
                     patch-remove-brewism.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Backport of upstream fix, see: https://github.com/valkey-io/valkey/issues/1051
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/70794
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" \
         ${worksrcpath}/valkey.conf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/files/d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch b/databases/valkey/files/d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8ab2284b0ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/valkey/files/d07c29791a4cecd8bce76b05d046981f39fe5fcd.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d07c29791a4cecd8bce76b05d046981f39fe5fcd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Binbin <binloveplay1314@qq.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 22 Sep 2024 20:20:55 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use _Thread_local to solve threads.h build issue (#1053)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Apparently this will fail to compile in some masOS version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+And internet claims _Thread_local is portable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #1051.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Binbin <binloveplay1314@qq.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/zmalloc.c | 6 +-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/zmalloc.c b/src/zmalloc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7b19107b66..7f9d7f6888 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/zmalloc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/zmalloc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,11 +88,7 @@ void zlibc_free(void *ptr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define dallocx(ptr, flags) je_dallocx(ptr, flags)
</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 __STDC_NO_THREADS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define thread_local __thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <threads.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define thread_local _Thread_local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_THREADS_NUM (IO_THREADS_MAX_NUM + 3 + 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* A thread-local storage which keep the current thread's index in the used_memory_thread array. */
</span></pre><pre style='margin:0'>

</pre>