<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/6191562324ca040e9818257b4118cb4c1563803d">https://github.com/macports/macports-ports/commit/6191562324ca040e9818257b4118cb4c1563803d</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 6191562 php: Update to 7.3.0RC4
</span>6191562 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6191562324ca040e9818257b4118cb4c1563803d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 26 11:00:43 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> php: Update to 7.3.0RC4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And add a patch to fix build failure on Lion.
</span>---
lang/php/Portfile | 11 +++--
lang/php/files/patch-php73-cpuid_count.diff | 76 +++++++++++++++++++++++++++++
2 files changed, 82 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 6cbf2ef..5a4e283 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;'>@@ -144,13 +144,13 @@ switch ${subport_branch} {
</span> # master_sites and livecheck, and update php.latest_stable_branch in the
# php-1.1 portgroup.
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.3.0RC3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.3.0RC4
</span> homepage https://qa.php.net/
master_sites https://downloads.php.net/~cmb/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d10290973696f1f85f46c8e7eb09ea6c6d511ad5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd6c7fa718ff5b430d64ae1b5cfdf3e076ceb0a4a8569927bba8fe65fa04c4b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11927028
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d2626f07af9e1734213295d9a8d065bcf41472f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 11582176003e0e8ca06dbdebab0921d539cab2ad795c0d90f146977859e21c26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11915112
</span> livecheck.url ${homepage}
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,11 +195,12 @@ if {[is_sapi_subport]} {
</span> depends_lib-append port:pcre
} else {
depends_lib-append port:pcre2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-${php}-cpuid_count.diff
</span> }
# Use -p1 to accommodate the Suhosin patch
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-${php}-scripts-php-config.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-${php}-scripts-php-config.in.diff
</span>
if {[vercmp ${branch} 5.3] <= 0} {
patchfiles-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php73-cpuid_count.diff b/lang/php/files/patch-php73-cpuid_count.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ed35802
</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-php73-cpuid_count.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure on Lion, which has a cpuid.h that doesn't have __cpuid_count.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/76825
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_cpuinfo.c.orig 2018-10-09 04:26:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_cpuinfo.c 2018-10-26 08:26:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static zend_cpu_info cpuinfo = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# ifdef HAVE_CPUID_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(HAVE_CPUID_H) && defined(HAVE_CPUID_COUNT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <cpuid.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __cpuid_count(func, subfunc, cpuinfo->eax, cpuinfo->ebx, cpuinfo->ecx, cpuinfo->edx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2018-10-09 04:26:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2018-10-26 08:26:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5871,6 +5859,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking whether __cpuid_count is available... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ${ac_cv_cpuid_count_available+:} false; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo_n "(cached) " >&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;'>++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <cpuid.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</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;'>++ unsigned eax, ebx, ecx, edx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __cpuid_count(0, 0, eax, ebx, ecx, edx);
</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;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ac_fn_c_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_cpuid_count_available=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>++ ac_cv_cpuid_count_available=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_cv_cpuid_count_available" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "$ac_cv_cpuid_count_available" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "#define HAVE_CPUID_COUNT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/main/php_config.h.in.orig 2018-10-09 04:26:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/main/php_config.h.in 2018-10-26 08:26:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,6 +508,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Compiler supports VLA */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_COMPILER_C99_VLA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* whether __cpuid_count is available */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_CPUID_COUNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the <cpuid.h> header file. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_CPUID_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>