[138676] trunk/dports/lang/php

[ryandesign at macports.org]

Revision: 138676
          https://trac.macports.org/changeset/138676
Author:   ryandesign at macports.org
Date:     2015-07-15 15:51:20 -0700 (Wed, 15 Jul 2015)
Log Message:
-----------
php70: fix build on 32-bit systems

Modified Paths:
--------------
    trunk/dports/lang/php/Portfile

Added Paths:
-----------
    trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2015-07-15 21:53:07 UTC (rev 138675)
+++ trunk/dports/lang/php/Portfile	2015-07-15 22:51:20 UTC (rev 138676)
@@ -167,6 +167,11 @@
                         patch-${php}-libxml-2.9.diff \
                         patch-${php}-pcre-8.30.diff
     }
+
+    if {[vercmp ${branch} 7.0] == 0} {
+        patchfiles-append \
+                        patch-${php}-Zend-zend_operators.c.diff
+    }
     
     # https://trac.macports.org/ticket/31590
     # Tested all subports (except oracle) and they built with clang-425.  The reported failure was with Xcode 4.2.

Added: trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff	2015-07-15 22:51:20 UTC (rev 138676)
@@ -0,0 +1,31 @@
+Fix build on 32-bit systems
+https://bugs.php.net/bug.php?id=70057
+http://git.php.net/?p=php-src.git;a=commit;h=e5a996f26855fe89459ae7dcc31034e44e70b91d
+--- a/Zend/zend_operators.c.orig
++++ b/Zend/zend_operators.c
+@@ -1760,7 +1760,7 @@ static inline void zend_free_obj_get_result(zval *op) /* {{{ */
+ }
+ /* }}} */
+ 
+-static zend_always_inline int i_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */
++ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */
+ {
+ 	int ret;
+ 	int converted = 0;
+@@ -1942,15 +1942,9 @@ static zend_always_inline int i_compare_function(zval *result, zval *op1, zval *
+ }
+ /* }}} */
+ 
+-ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */
+-{
+-	return i_compare_function(result, op1, op2);
+-}
+-/* }}} */
+-
+ ZEND_API int zval_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */
+ {
+-	return i_compare_function(result, op1, op2);
++	return compare_function(result, op1, op2);
+ }
+ /* }}} */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150715/c197b1fb/attachment.html>