<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/de759da504a757417cd90997abb02a41aaf723e2">https://github.com/macports/macports-ports/commit/de759da504a757417cd90997abb02a41aaf723e2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit de759da504a757417cd90997abb02a41aaf723e2
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 2 07:11:19 2024 -0700

<span style='display:block; white-space:pre;color:#404040;'>    zstd: properly handle link flag with space
</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/70130
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://gitlab.kitware.com/cmake/cmake/-/issues/26024
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://github.com/facebook/zstd/pull/4056
</span>---
 archivers/zstd/Portfile                            |  3 ++-
 archivers/zstd/files/patch-prper_linker_flags.diff | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/Portfile b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28d90db1943..3ebcb823326 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,8 @@ subport zstdConfig.cmake {
</span> }
 
 patchfiles                  patch-zstd-tiger-no-backtrace.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            flags.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            flags.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-prper_linker_flags.diff
</span> 
 # Fix upgrade from previous version because -I flags are in the wrong order.
 configure.cppflags-replace  -I${prefix}/include -isystem${prefix}/include
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/files/patch-prper_linker_flags.diff b/archivers/zstd/files/patch-prper_linker_flags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..50568ca541a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/files/patch-prper_linker_flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see https://github.com/facebook/zstd/pull/4056
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see https://trac.macports.org/ticket/70130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see https://gitlab.kitware.com/cmake/cmake/-/issues/26024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/cmake/CMakeModules/AddZstdCompilationFlags.cmake.orig    2024-03-21 15:05:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/cmake/CMakeModules/AddZstdCompilationFlags.cmake 2024-06-02 06:18:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # Add noexecstack flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        EnableCompilerFlag("-z noexecstack" false false true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        EnableCompilerFlag("LINKER:SHELL:-z noexecstack" false false true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # CFLAGS & CXXFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         EnableCompilerFlag("-Qunused-arguments" true true false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         EnableCompilerFlag("-Wa,--noexecstack" true true false)
</span></pre><pre style='margin:0'>

</pre>