<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/62ee49555460c61c7d1bc74f1bc08d96c44887e4">https://github.com/macports/macports-ports/commit/62ee49555460c61c7d1bc74f1bc08d96c44887e4</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 62ee495 php: Build universal properly
</span>62ee495 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62ee49555460c61c7d1bc74f1bc08d96c44887e4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Nov 29 04:28:17 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> php: Build universal properly
</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/41595
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also ensure that the parsers are not regenerated, even if the
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies to do so are installed.
</span>---
lang/php/Portfile | 29 ++++++++++++++++++++++++-----
lang/php/files/patch-php52-configure.diff | 21 +++++++++++++++++++++
lang/php/files/patch-php53-configure.diff | 21 +++++++++++++++++++++
3 files changed, 66 insertions(+), 5 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 c0b0635..a48ab0b 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;'>@@ -188,6 +188,10 @@ if {[is_sapi_subport]} {
</span> patch.pre_args -p1
patchfiles patch-${php}-scripts-php-config.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 5.3] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${php}-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[vercmp ${branch} 5.2] <= 0} {
patchfiles-append \
patch-${php}-libxml-2.9.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,6 +237,11 @@ if {[is_sapi_subport]} {
</span> --disable-cgi \
--disable-cli
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure we don't regenerate the parsers even if flex/re2c/bison are installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env LEX=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RE2C=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ YACC=true
</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;'>@@ -253,7 +262,7 @@ if {[is_sapi_subport]} {
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args INSTALL_ROOT=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.destdir INSTALL_ROOT=${destroot}
</span>
variant debug description {Enable debug support (useful to analyze a PHP-related core dump)} {
configure.args-append --enable-debug
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,13 +309,18 @@ if {[is_sapi_subport]} {
</span> ### CLI SAPI ###
subport ${php} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span> PortGroup select 1.0
switch -- ${version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.2.17 {revision 12}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.3.29 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.4.45 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.5.38 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2.17 {revision 13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3.29 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4.45 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5.38 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6.32 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.0.25 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.1.11 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.0RC6 {revision 1}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,6 +328,11 @@ subport ${php} {
</span> select.group php
select.file ${filespath}/${subport}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure the build date is the same for all universal archs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^PHP_BUILD_DATE=.*$|PHP_BUILD_DATE=[clock format [clock seconds] -format {%Y-%m-%d}]|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace --disable-cli --enable-cli
destroot.target install-cli install-build install-headers install-programs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php52-configure.diff b/lang/php/files/patch-php52-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..321f9e3
</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/patch-php52-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/742a0106fefefe5ee1638271a1f59b69fb0ba015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2017-11-18 15:29:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2017-11-18 15:34:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3011,7 +3011,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $ac_n "(cached) $ac_c" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php_cv_bison_version=invalid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$bison_version_vars"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $bison_version_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107382,7 +107382,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $ac_n "(cached) $ac_c" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php_cv_bison_version=invalid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$bison_version_vars"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $bison_version_vars
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php53-configure.diff b/lang/php/files/patch-php53-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7089239
</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/patch-php53-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/742a0106fefefe5ee1638271a1f59b69fb0ba015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2014-08-13 14:27:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2017-11-18 15:34:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3014,7 +3014,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $ac_n "(cached) $ac_c" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php_cv_bison_version=invalid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$bison_version_vars"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $bison_version_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105210,7 +105210,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $ac_n "(cached) $ac_c" 1>&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php_cv_bison_version=invalid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$bison_version_vars"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $bison_version_vars
</span></pre><pre style='margin:0'>
</pre>