Revision
105599
Author
ryandesign@macports.org
Date
2013-04-26 15:07:16 -0700 (Fri, 26 Apr 2013)

Log Message

fontconfig: fix build on Tiger (#38936)

Modified Paths

Added Paths

Diff

Modified: trunk/dports/graphics/fontconfig/Portfile (105598 => 105599)


--- trunk/dports/graphics/fontconfig/Portfile	2013-04-26 22:03:11 UTC (rev 105598)
+++ trunk/dports/graphics/fontconfig/Portfile	2013-04-26 22:07:16 UTC (rev 105599)
@@ -38,7 +38,8 @@
 lappend add_fonts           ${prefix}/share/fonts
 set docdir                  ${prefix}/share/doc/${name}
 
-patchfiles                  patch-docbook-4.2.diff
+patchfiles                  patch-docbook-4.2.diff \
+                            patch-src-fcatomic.diff
 
 configure.args              --disable-silent-rules HASDOCBOOK=no

Added: trunk/dports/graphics/fontconfig/files/patch-src-fcatomic.diff (0 => 105599)


--- trunk/dports/graphics/fontconfig/files/patch-src-fcatomic.diff	                        (rev 0)
+++ trunk/dports/graphics/fontconfig/files/patch-src-fcatomic.diff	2013-04-26 22:07:16 UTC (rev 105599)
@@ -0,0 +1,24 @@
+--- src/fcatomic.h.orig
++++ src/fcatomic.h
+@@ -69,13 +69,21 @@ typedef LONG fc_atomic_int_t;
+ 
+ #elif !defined(FC_NO_MT) && defined(__APPLE__)
+ 
++#include <AvailabilityMacros.h>
+ #include <libkern/OSAtomic.h>
+ 
+ typedef int fc_atomic_int_t;
+ #define fc_atomic_int_add(AI, V)	(OSAtomicAdd32Barrier ((V), &(AI)) - (V))
+ 
+ #define fc_atomic_ptr_get(P)		(OSMemoryBarrier (), (void *) *(P))
++
++#ifdef MAC_OS_X_VERSION_10_5
+ #define fc_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
++#elif defined(__LP64__)
++#define fc_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwap64Barrier ((void *) (O), (void *) (N), (void **) (P))
++#else
++#define fc_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwap32Barrier ((void *) (O), (void *) (N), (void **) (P))
++#endif
+ 
+ 
+ #elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)