[98049] trunk/dports/databases/kyotocabinet

[jeremyhu at macports.org]

Revision: 98049
          http://trac.macports.org//changeset/98049
Author:   jeremyhu at macports.org
Date:     2012-09-23 22:16:43 -0700 (Sun, 23 Sep 2012)
Log Message:
-----------
kyotocabinet: Fix build with clang

Modified Paths:
--------------
    trunk/dports/databases/kyotocabinet/Portfile

Added Paths:
-----------
    trunk/dports/databases/kyotocabinet/files/patch-kcthread.cc

Modified: trunk/dports/databases/kyotocabinet/Portfile
===================================================================
--- trunk/dports/databases/kyotocabinet/Portfile	2012-09-24 05:07:37 UTC (rev 98048)
+++ trunk/dports/databases/kyotocabinet/Portfile	2012-09-24 05:16:43 UTC (rev 98049)
@@ -31,7 +31,7 @@
 
 dist_subdir         ${name}/${version}_${revision}
 
-patchfiles          patch-configure.diff
+patchfiles          patch-configure.diff patch-kcthread.cc
 
 depends_lib         port:zlib
 
@@ -41,10 +41,6 @@
 configure.cppflags
 configure.ldflags
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
-
 configure.args      --mandir=${prefix}/share/man \
                     --datadir=${prefix}/share/doc \
                     --disable-lzo \

Added: trunk/dports/databases/kyotocabinet/files/patch-kcthread.cc
===================================================================
--- trunk/dports/databases/kyotocabinet/files/patch-kcthread.cc	                        (rev 0)
+++ trunk/dports/databases/kyotocabinet/files/patch-kcthread.cc	2012-09-24 05:16:43 UTC (rev 98049)
@@ -0,0 +1,20 @@
+--- kcthread.cc.orig	2012-09-23 22:11:51.000000000 -0700
++++ kcthread.cc	2012-09-23 22:12:24.000000000 -0700
+@@ -668,7 +668,7 @@ void SpinLock::lock() {
+ #elif _KC_GCCATOMIC
+   _assert_(true);
+   uint32_t wcnt = 0;
+-  while (!__sync_bool_compare_and_swap(&opq_, 0, 1)) {
++  while (!__sync_bool_compare_and_swap((uintptr_t *)&opq_, 0, 1)) {
+     if (wcnt >= LOCKBUSYLOOP) {
+       Thread::chill();
+     } else {
+@@ -693,7 +693,7 @@ bool SpinLock::lock_try() {
+   return ::InterlockedCompareExchange((LONG*)&opq_, 1, 0) == 0;
+ #elif _KC_GCCATOMIC
+   _assert_(true);
+-  return __sync_bool_compare_and_swap(&opq_, 0, 1);
++  return __sync_bool_compare_and_swap((uintptr_t *)&opq_, 0, 1);
+ #else
+   _assert_(true);
+   ::pthread_spinlock_t* spin = (::pthread_spinlock_t*)opq_;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120923/68bae42a/attachment.html>