[56393] trunk/dports/lang/php5-devel

[ryandesign at macports.org]

Revision: 56393
          http://trac.macports.org/changeset/56393
Author:   ryandesign at macports.org
Date:     2009-08-26 18:22:43 -0700 (Wed, 26 Aug 2009)
Log Message:
-----------
php5-devel: merge r56392 from php5: fix mysqlnd-related build failure on PowerPC Macs; see #20833

Revision Links:
--------------
    http://trac.macports.org/changeset/56392

Modified Paths:
--------------
    trunk/dports/lang/php5-devel/Portfile

Added Paths:
-----------
    trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff

Property Changed:
----------------
    trunk/dports/lang/php5-devel/


Property changes on: trunk/dports/lang/php5-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/lang/php5:52241-52279,53127,56346
   + /trunk/dports/lang/php5:52241-52279,53127,56346,56392

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2009-08-27 01:15:25 UTC (rev 56392)
+++ trunk/dports/lang/php5-devel/Portfile	2009-08-27 01:22:43 UTC (rev 56393)
@@ -50,6 +50,7 @@
 
 patchfiles \
     patch-ext-date-php_date.c.diff \
+    patch-ext-mysqlnd-mysqlnd_portability.h.diff \
     patch-bind.diff
 
 use_autoconf            yes

Copied: trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff (from rev 56392, trunk/dports/lang/php5/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff)
===================================================================
--- trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff	                        (rev 0)
+++ trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff	2009-08-27 01:22:43 UTC (rev 56393)
@@ -0,0 +1,53 @@
+http://trac.macports.org/ticket/20833
+--- ext/mysqlnd/mysqlnd_portability.h	2009/08/25 14:14:23	287694
++++ ext/mysqlnd/mysqlnd_portability.h	2009/08/25 14:25:01	287695
+@@ -174,11 +174,16 @@
+ #define MYSQLND_LLU_SPEC "%lu"
+ #endif
+ 
+-#if __powerpc64__
++#if __powerpc64__ || __ppc64__
+ #define MYSQLND_LL_SPEC	"%li"
+ #define MYSQLND_LLU_SPEC "%lu"
+ #endif
+ 
++#if (__powerpc__ || __ppc__ ) && !(__powerpc64__ || __ppc64__)
++#define MYSQLND_LL_SPEC	"%lli"
++#define MYSQLND_LLU_SPEC "%llu"
++#endif
++
+ #if __x86_64__
+ #define MYSQLND_LL_SPEC	"%li"
+ #define MYSQLND_LLU_SPEC "%lu"
+@@ -189,11 +194,6 @@
+ #define MYSQLND_LLU_SPEC "%lu"
+ #endif
+ 
+-#if __powerpc__ && !__powerpc64__
+-#define MYSQLND_LL_SPEC	"%lli"
+-#define MYSQLND_LLU_SPEC "%llu"
+-#endif
+-
+ #if __s390__ && !__s390x__
+ #define MYSQLND_LL_SPEC	"%lli"
+ #define MYSQLND_LLU_SPEC "%llu"
+@@ -203,6 +203,19 @@
+ #define MYSQLND_LL_SPEC "%lli"
+ #define MYSQLND_LLU_SPEC "%llu"
+ #endif
++
++#ifndef MYSQLND_LL_SPEC
++#if SIZEOF_LONG == 8
++#define MYSQLND_LL_SPEC	"%li"
++#endif
++#endif
++
++#ifndef MYSQLND_LLU_SPEC
++#if SIZEOF_LONG == 8
++#define MYSQLND_LLU_SPEC	"%li"
++#endif
++#endif
++
+ 
+ #define MYSQLND_SZ_T_SPEC "%zd"
+ #ifndef L64
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090826/81a11536/attachment.html>