<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/80fe9a62668d13226326509c23da58d0cce1e546">https://github.com/macports/macports-ports/commit/80fe9a62668d13226326509c23da58d0cce1e546</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 80fe9a62668 valkey: fix build conflict with lua
</span>80fe9a62668 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 80fe9a62668d13226326509c23da58d0cce1e546
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu Oct 10 17:15:42 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> valkey: fix build conflict with lua
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/71078
</span>---
databases/valkey/Portfile | 8 +++++++-
1 file changed, 7 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 53e09f583fc..3af564085ad 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;'>@@ -11,7 +11,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span>
github.setup valkey-io valkey 8.0.1
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;'>@@ -37,6 +37,12 @@ post-patch {
</span> # valkey and dep makefiles have their own optflags
configure.optflags
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid build conflict with lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/71078
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[string match *gcc* ${configure.compiler}] &&
${configure.build_arch} in [list i386 ppc]} {
# https://github.com/valkey-io/valkey/issues/434
</pre><pre style='margin:0'>
</pre>