<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/b3e55a05aa4ad86271d4f21dc6634fb8eda7c27a">https://github.com/macports/macports-ports/commit/b3e55a05aa4ad86271d4f21dc6634fb8eda7c27a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b3e55a05aa4ad86271d4f21dc6634fb8eda7c27a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 2 21:03:06 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php72 and older: incompatible with Xcode 12+
</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/60988
</span>---
_resources/port1.0/group/php-1.1.tcl | 13 ++++++++++++-
lang/php/Portfile | 13 +++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/php-1.1.tcl b/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 82dcead2bf6..0b6a332636b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,7 +367,7 @@ pre-livecheck {
</span>
proc php.add_port_code {} {
global php php.branch php.branches php.build_dirs php.config php.extension_ini php.extensions php.ini_dir php.rootname
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global destroot macosx_deployment_target name os.major subport version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global destroot macosx_deployment_target name os.major subport version xcodeversion
</span>
# Set up distfiles default for non-bundled extensions.
default distname {${php.rootname}-${version}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,6 +382,17 @@ proc php.add_port_code {} {
</span> if {[vercmp ${macosx_deployment_target} 11] >= 0} {
macosx_deployment_target 10.[expr {${os.major} - 4}]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${php.branch} 7.3] < 0 && [vercmp ${xcodeversion} 12.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Implicit function declarations. Need to backport upstream fixes from php73+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.php.net/80176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/60988
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} @${version} cannot currently be compiled with Xcode 12 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible Xcode version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.pre_args-append --with-php-config=${php.config}
<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 d4c9c04d752..a549385fddd 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;'>@@ -208,6 +208,19 @@ if {[vercmp ${branch} 8.0] == 0} {
</span>
if {[is_sapi_subport]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.3] < 0 && [vercmp ${xcodeversion} 12.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Implicit function declarations. Need to backport upstream fixes from php73+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.php.net/80176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/60988
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} @${version} cannot currently be compiled with Xcode 12 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible Xcode version"
</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> depends_build port:pkgconfig
if {${subport} ne ${php}} {
</pre><pre style='margin:0'>
</pre>