<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/6fab51c117f2ef03714b4d04cf122cb70a0277a2">https://github.com/macports/macports-ports/commit/6fab51c117f2ef03714b4d04cf122cb70a0277a2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6fab51c117f2ef03714b4d04cf122cb70a0277a2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 6 16:10:23 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> php-swoole, php-openswoole: Reinstate conflict
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If both are active, php issues many warnings when it launches like:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Warning: Function registration failed - duplicate name - swoole_version
</span><span style='display:block; white-space:pre;color:#404040;'> in Unknown on line 0
</span>---
php/php-openswoole/Portfile | 2 ++
php/php-swoole/Portfile | 2 ++
2 files changed, 4 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-openswoole/Portfile b/php/php-openswoole/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b08eeebf95..eee9c368078 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-openswoole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-openswoole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,8 @@ if {${name} ne ${subport}} {
</span> legacysupport.newest_darwin_requires_legacy \
15
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${php}-swoole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-swoole/Portfile b/php/php-swoole/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 23c19b25d61..55250f8cfe5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-swoole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-swoole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,8 @@ description an event-driven asynchronous & concurrent & coroutine ne
</span> long_description ${name} is ${description}.
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${php}-openswoole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Not sure what version
if {[vercmp ${version} 4.0.0] >= 0} {
PortGroup legacysupport 1.1
</pre><pre style='margin:0'>
</pre>