<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/c3f52de2da504c06c357e21843f380cd790b0d13">https://github.com/macports/macports-ports/commit/c3f52de2da504c06c357e21843f380cd790b0d13</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 c3f52de2da5 php-swoole: 2nd try to fix arm64 build failure
</span>c3f52de2da5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c3f52de2da504c06c357e21843f380cd790b0d13
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 17 01:56:24 2020 -0600

<span style='display:block; white-space:pre;color:#404040;'>    php-swoole: 2nd try to fix arm64 build failure
</span>---
 php/php-swoole/Portfile              |  6 ++---
 php/php-swoole/files/arm64-4.4.patch | 15 ------------
 php/php-swoole/files/arm64-4.5.patch | 15 ------------
 php/php-swoole/files/arm64.patch     | 44 ++++++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 34 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 9966940d90c..6da07cc40e0 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;'>@@ -62,11 +62,9 @@ if {${name} ne ${subport}} {
</span>                 # CLOCK_REALTIME
                 legacysupport.newest_darwin_requires_legacy \
                                 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                patchfiles      arm64-4.5.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                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;'>+            patchfiles      arm64.patch
</span>         }
     }
 
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1cc938a910..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-swoole/files/arm64-4.4.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix detection of arm64 CPU.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/swoole/swoole-src/issues/3917
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.m4.orig 2019-07-16 03:26:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.m4      2020-12-16 23:54:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -609,9 +609,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [x86_64*], [SW_CPU="x86_64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [x86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [i?86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [aarch64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [arm64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         SW_NO_USE_ASM_CONTEXT="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf7dac7a715..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-swoole/files/arm64-4.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix detection of arm64 CPU.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/swoole/swoole-src/issues/3917
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.m4.orig 2020-11-26 21:02:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.m4      2020-12-16 23:53:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -602,9 +602,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [x86_64*], [SW_CPU="x86_64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [x86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [i?86*], [SW_CPU="x86"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [aarch64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [arm64*], [SW_CPU="arm64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      [arm*], [SW_CPU="arm"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [mips*], [SW_CPU="mips32"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         SW_USE_ASM_CONTEXT="no"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-swoole/files/arm64.patch b/php/php-swoole/files/arm64.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a5ab509c3fe
</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.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</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-17 01:26:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -612,13 +612,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if test "$SW_OS" = "MAC"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if test "$SW_CPU" = "arm"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            SW_CONTEXT_ASM_FILE="arm_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        elif test "$SW_CPU" = "arm64"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            SW_CONTEXT_ASM_FILE="arm64_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             SW_CONTEXT_ASM_FILE="combined_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     elif test "$SW_CPU" = "x86_64"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if test "$SW_OS" = "LINUX"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             SW_CONTEXT_ASM_FILE="x86_64_sysv_elf_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- thirdparty/boost/asm/jump_combined_sysv_macho_gas.S.orig       2020-11-26 21:02:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ thirdparty/boost/asm/jump_combined_sysv_macho_gas.S    2020-12-17 01:25:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include "jump_ppc32_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include "jump_ppc64_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #include "jump_arm_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #include "jump_arm64_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #error "No arch's"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- thirdparty/boost/asm/make_combined_sysv_macho_gas.S.orig       2020-11-26 21:02:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ thirdparty/boost/asm/make_combined_sysv_macho_gas.S    2020-12-17 01:25:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include "make_ppc32_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #include "make_ppc64_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #include "make_arm_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #include "make_arm64_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #error "No arch's"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>

</pre>