<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/92850e50480bbbdd024f244140e52cb4271dd033">https://github.com/macports/macports-ports/commit/92850e50480bbbdd024f244140e52cb4271dd033</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 92850e50480 php73: Avoid need for newer compiler on El Capitan
</span>92850e50480 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92850e50480bbbdd024f244140e52cb4271dd033
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jun 10 11:47:58 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> php73: Avoid need for newer compiler on El Capitan
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Most versions of Xcode clang on El Capitan miscompile the datetime
</span><span style='display:block; white-space:pre;color:#404040;'> parsers that were generated with re2c 2.0.3 resulting in a runtime hang.
</span><span style='display:block; white-space:pre;color:#404040;'> Rather than blacklisting Xcode clang for this reason, regenerate the
</span><span style='display:block; white-space:pre;color:#404040;'> parsers with re2c 0.15.3. Installing and using re2c 0.15.3 is faster
</span><span style='display:block; white-space:pre;color:#404040;'> than installing a new version of clang.
</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/61351
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Certain details about the compiler that was used to compile php are
</span><span style='display:block; white-space:pre;color:#404040;'> recorded in php_config.h. This causes problems if the compiler used to
</span><span style='display:block; white-space:pre;color:#404040;'> compile php is not the same as the compiler used to compile a php
</span><span style='display:block; white-space:pre;color:#404040;'> extension later.
</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/62022
</span>---
lang/php/Portfile | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 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 b9380b9b755..f066ac416f4 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,12 +263,6 @@ 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:#ffe0e0;'>- # These compilers miscompile datetime code generated with re2c > 0.15.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which causes runtime hangs. See https://bugs.php.net/80376.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} 7.3] == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang > 700.1.81 < 802.0.38}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set phpinidir ${prefix}/etc/${php}
set extraphpinidir ${prefix}/var/db/${php}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,6 +308,21 @@ if {[is_sapi_subport]} {
</span> RE2C=true \
YACC=true
<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;'>+ # Regenerate datetime parsers with re2c < 0.16 to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # miscompilation by clang > 700.1.81 < 802.0.38 that results in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a runtime hang. See https://bugs.php.net/80376.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:re2c-0.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach parser {parse_date parse_iso_intervals} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/derickr/timelib/blob/2018.04/Makefile#L32-L36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/ext/date/lib "${prefix}/bin/re2c-0.15 -d -b ${parser}.re > ${parser}.c"
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[vercmp ${branch} 5.3] >= 0} {
configure.args-append \
--enable-fileinfo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -402,7 +411,7 @@ subport ${php} {
</span> 7.0.33 {revision 4}
7.1.33 {revision 2}
7.2.34 {revision 3}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.28 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.28 {revision 1}
</span> 7.4.20 {revision 0}
8.0.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -552,7 +561,7 @@ 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.28 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.28 {revision 1}
</span> 7.4.20 {revision 0}
8.0.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -617,7 +626,7 @@ 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.28 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.28 {revision 1}
</span> 7.4.20 {revision 0}
8.0.7 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -658,7 +667,7 @@ 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.28 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.28 {revision 1}
</span> 7.4.20 {revision 0}
8.0.7 {revision 0}
}
</pre><pre style='margin:0'>
</pre>