<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03338c491a558acc1b6afa3e7a590e1067357c94">https://github.com/macports/macports-ports/commit/03338c491a558acc1b6afa3e7a590e1067357c94</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 03338c491a5 php82: Fix C11 build with some clang versions
</span>03338c491a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03338c491a558acc1b6afa3e7a590e1067357c94
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Feb 21 23:47:50 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> php82: Fix C11 build with some clang versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64113
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64255
</span>---
lang/php/Portfile | 1 +
.../files/patch-php82-ext-hash-static_assert.diff | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6ad5597078..e9dc224bc67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,6 +261,7 @@ if {[is_sapi_subport]} {
</span>
if {[vercmp ${branch} >= 8.2]} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${php}-ext-hash-static_assert.diff \
</span> patch-${php}-atomic.diff
}
if {[vercmp ${branch} 7.0] >= 0 && [vercmp ${branch} 7.2] <= 0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-ext-hash-static_assert.diff b/lang/php/files/patch-php82-ext-hash-static_assert.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..18214871a1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php82-ext-hash-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+No longer depend on `<assert.h>` for XXH_STATIC_ASSERT since some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+versions are buggy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use `_Static_assert` instead, which is part of the C11 language.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Cyan4973/xxHash/issues/671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/10659
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/hash/xxhash/xxhash.h.orig 2021-11-29 12:34:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/hash/xxhash/xxhash.h 2021-12-28 19:55:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1546,8 +1546,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* note: use after variable declarations */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef XXH_STATIC_ASSERT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span></pre><pre style='margin:0'>
</pre>