<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/c61538699bd70fc586597a32c4c2e12cf66b332f">https://github.com/macports/macports-ports/commit/c61538699bd70fc586597a32c4c2e12cf66b332f</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 c61538699bd php: Rebuild SAPIs with newer clang on 10.11/10.12
</span>c61538699bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c61538699bd70fc586597a32c4c2e12cf66b332f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Dec 19 10:16:09 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php: Rebuild SAPIs with newer clang on 10.11/10.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61351
</span>---
lang/php/Portfile | 104 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 92 insertions(+), 12 deletions(-)
<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 257ebdd071e..3e61d328901 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;'>@@ -263,6 +263,14 @@ if {[is_sapi_subport]} {
</span> # Xcode 4.3 may work, but leaving it blacklisted due to lack of testing
compiler.blacklist {clang < 400}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These compilers miscompile re2c-generated datetime code and cause
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # runtime hangs. See https://bugs.php.net/80376. Monitor this bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # report to see if they regenerate with re2c 0.15.3 in a later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # version; if so we could remove this blacklist again.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.3] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang > 700.1.81 < 802.0.38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set phpinidir ${prefix}/etc/${php}
set extraphpinidir ${prefix}/var/db/${php}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,9 +404,27 @@ subport ${php} {
</span> 7.0.33 {revision 3}
7.1.33 {revision 1}
7.2.34 {revision 2}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 7.4.13 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 8.0.0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -546,9 +572,27 @@ subport ${php}-apache2handler {
</span> 7.0.33 {revision 1}
7.1.33 {revision 1}
7.2.34 {revision 2}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 7.4.13 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 8.0.0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -611,9 +655,27 @@ subport ${php}-cgi {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 2}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 7.4.13 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 8.0.0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -652,9 +714,27 @@ subport ${php}-fpm {
</span> 7.0.33 {revision 1}
7.1.33 {revision 1}
7.2.34 {revision 2}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 7.4.13 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</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;'>+ 8.0.0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && (${os.major} == 15 || ${os.major} == 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
description ${php} FPM SAPI
</pre><pre style='margin:0'>
</pre>