diff options
| author | Jack Nagel | 2013-02-05 09:23:35 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-02-05 09:58:11 -0600 |
| commit | 40ece6bedd0988ac79d6c2c6d0d9bbd34533c309 (patch) | |
| tree | 9260ebe848128514affa9d8f9cb1ace1b81b7030 | |
| parent | 821995c1a7b2867af5c9f7d1f1551ca822416831 (diff) | |
| download | homebrew-40ece6bedd0988ac79d6c2c6d0d9bbd34533c309.tar.bz2 | |
berkeley-db: patch for build under Xcode 4.6
Fixes #17596.
| -rw-r--r-- | Library/Formula/berkeley-db.rb | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/Library/Formula/berkeley-db.rb b/Library/Formula/berkeley-db.rb index 8c1396d57..f5eb323ef 100644 --- a/Library/Formula/berkeley-db.rb +++ b/Library/Formula/berkeley-db.rb @@ -7,6 +7,9 @@ class BerkeleyDb < Formula option 'with-java', 'Compile with Java support.' + # Fix build under Xcode 4.6 + def patches; DATA; end + def install # BerkeleyDB dislikes parallel builds ENV.deparallelize @@ -28,3 +31,27 @@ class BerkeleyDb < Formula end end end + +__END__ +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index 096176a..561037a 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_db((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __atomic_compare_exchange_db( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; |