<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/a64d89a2a083631a51e4b0ffaa0c51843221ccee">https://github.com/macports/macports-ports/commit/a64d89a2a083631a51e4b0ffaa0c51843221ccee</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a64d89a2a083631a51e4b0ffaa0c51843221ccee
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Feb 3 04:23:56 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> php: Fix macOS 11+ libtool bug the right way
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> php (the CLI SAPI) installs a libtool.m4 file that gets used to build
</span><span style='display:block; white-space:pre;color:#404040;'> php extensions. php 7.4 and later already have an upstream fix for the
</span><span style='display:block; white-space:pre;color:#404040;'> macOS 11+ libtool bug. Backport that patch to earlier php versions
</span><span style='display:block; white-space:pre;color:#404040;'> rather than using the fake deployment target 10.16 workaround.
</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/61464
</span>---
_resources/port1.0/group/php-1.1.tcl | 8 +-------
lang/php/Portfile | 22 +++++++++++++---------
lang/php/files/dynamic_lookup-11.patch | 24 ++++++++++++++++++++++++
3 files changed, 38 insertions(+), 16 deletions(-)
<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 1ef2480038d..42854349870 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 xcodeversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global destroot name 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;'>@@ -377,12 +377,6 @@ proc php.add_port_code {} {
</span> depends_lib-append port:${php}
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # PHP's libtool.m4 has the macOS 11+ bug; use the compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # deployment target for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${macosx_deployment_target} 11] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_deployment_target 10.[expr {${os.major} - 4}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[vercmp ${php.branch} 7.0] < 0 && [vercmp ${xcodeversion} 12.0] >= 0} {
# Implicit function declarations. Need to backport upstream fixes from php73+.
# https://bugs.php.net/80176
<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 3a8d3e9af1d..4ceb72025e7 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;'>@@ -412,15 +412,15 @@ subport ${php} {
</span> PortGroup select 1.0
switch -- ${version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.2.17 {revision 15}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.3.29 {revision 6}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.4.45 {revision 5}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.5.38 {revision 6}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.6.40 {revision 4}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.0.33 {revision 4}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.1.33 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.34 {revision 3}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.33 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2.17 {revision 16}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3.29 {revision 7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4.45 {revision 6}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5.38 {revision 7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6.40 {revision 5}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.0.33 {revision 5}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.1.33 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.34 {revision 4}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.33 {revision 1}
</span> 7.4.27 {revision 0}
8.0.15 {revision 0}
8.1.2 {revision 0}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,6 +443,10 @@ subport ${php} {
</span> patchfiles-append patch-${php}-icu-61.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[vercmp ${branch} 8.0] < 0} {
post-patch {
# Ensure the build date is the same for all universal archs.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/dynamic_lookup-11.patch b/lang/php/files/dynamic_lookup-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..08ae96fdc4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recognize macOS 11 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=80393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/build/libtool.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/build/libtool.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -340,7 +340,7 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.[[012]]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5799,7 +5799,7 @@ _LT_EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.[[012]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span></pre><pre style='margin:0'>
</pre>