<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/7c5a283270dfd8322661f01eddc7c5341e5675a4">https://github.com/macports/macports-ports/commit/7c5a283270dfd8322661f01eddc7c5341e5675a4</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 7c5a283270d php-swoole: Try to fix an arm64 build failure
</span>7c5a283270d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7c5a283270dfd8322661f01eddc7c5341e5675a4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 17 00:07:29 2020 -0600

<span style='display:block; white-space:pre;color:#404040;'>    php-swoole: Try to fix an arm64 build failure
</span>---
 php/php-swoole/Portfile              | 26 ++++++++++++++++----------
 php/php-swoole/files/arm64-4.4.patch | 15 +++++++++++++++
 php/php-swoole/files/arm64-4.5.patch | 15 +++++++++++++++
 3 files changed, 46 insertions(+), 10 deletions(-)

<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 7134618b312..9966940d90c 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;'>@@ -51,18 +51,23 @@ if {${name} ne ${subport}} {
</span>         # strndup
         legacysupport.newest_darwin_requires_legacy \
                         10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[vercmp ${version} 4.0.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp ${version} 4.0.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            compiler.cxx_standard 2011
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[vercmp ${version} 4.5.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # https://github.com/swoole/swoole-src/issues/3896
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # CLOCK_REALTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        legacysupport.newest_darwin_requires_legacy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[vercmp ${version} 4.5.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # https://github.com/swoole/swoole-src/issues/3896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # CLOCK_REALTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                legacysupport.newest_darwin_requires_legacy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles      arm64-4.5.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles      arm64-4.4.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     depends_lib-append  port:hiredis \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +75,7 @@ if {${name} ne ${subport}} {
</span>                         path:lib/libssl.dylib:openssl \
                         port:zlib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     compiler.blacklist-append \
                         *gcc-4.0 *gcc-4.2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-swoole/files/arm64-4.4.patch b/php/php-swoole/files/arm64-4.4.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e1cc938a910
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-swoole/files/arm64-4.4.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix detection of arm64 CPU.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/swoole/swoole-src/issues/3917
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.m4.orig 2019-07-16 03:26:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.m4      2020-12-16 23:54:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -609,9 +609,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [x86_64*], [SW_CPU="x86_64"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [x86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [i?86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [aarch64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [arm64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         SW_NO_USE_ASM_CONTEXT="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         AC_DEFINE([SW_NO_USE_ASM_CONTEXT], 1, [use boost asm context?])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-swoole/files/arm64-4.5.patch b/php/php-swoole/files/arm64-4.5.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf7dac7a715
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-swoole/files/arm64-4.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix detection of arm64 CPU.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/swoole/swoole-src/issues/3917
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.m4.orig 2020-11-26 21:02:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.m4      2020-12-16 23:53:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -602,9 +602,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [x86_64*], [SW_CPU="x86_64"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [x86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [i?86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [aarch64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [arm64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [mips*], [SW_CPU="mips32"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         SW_USE_ASM_CONTEXT="no"
</span></pre><pre style='margin:0'>

</pre>