<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/d242053632fa2c95c0b88e3ddeef744d32236093">https://github.com/macports/macports-ports/commit/d242053632fa2c95c0b88e3ddeef744d32236093</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 d242053 php: Fix php73 build on i386
</span>d242053 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d242053632fa2c95c0b88e3ddeef744d32236093
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 15 01:08:02 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> php: Fix php73 build on i386
</span>---
lang/php/Portfile | 1 +
.../php/files/patch-php73-Zend-zend_cpuinfo.c.diff | 29 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
<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 0eba3de..036661c 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;'>@@ -195,6 +195,7 @@ 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}-Zend-zend_cpuinfo.c.diff
</span> }
# Use -p1 to accommodate the Suhosin patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php73-Zend-zend_cpuinfo.c.diff b/lang/php/files/patch-php73-Zend-zend_cpuinfo.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..639b584
</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-Zend-zend_cpuinfo.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Provide an i386 implementation of __zend_cpuid, based on __cpuid_count from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpuid.h in Xcode 5.1.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=76654
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_cpuinfo.c.orig 2018-11-06 04:22:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_cpuinfo.c 2018-11-15 00:16:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,11 +36,23 @@
</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;'>+ static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __i386__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* PIC on i386 uses %ebx, so preserve it. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __asm__ __volatile__ (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "pushl %%ebx\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "cpuid\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "mov %%ebx,%1\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "popl %%ebx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : "=a"(cpuinfo->eax), "=r"(cpuinfo->ebx), "=c"(cpuinfo->ecx), "=d"(cpuinfo->edx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : "a"(func), "c"(subfunc)
</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;'>+ __asm__ __volatile__ (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "cpuid"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "=a"(cpuinfo->eax), "=b"(cpuinfo->ebx), "=c"(cpuinfo->ecx), "=d"(cpuinfo->edx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "a"(func), "c"(subfunc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(ZEND_WIN32) && !defined(__clang__)
</span></pre><pre style='margin:0'>
</pre>