berkeley-db@4: fix compilation with Xcode 10
Closes #32552. Signed-off-by: FX Coudert <fxcoudert@gmail.com>
This commit is contained in:
parent
613d15f8cb
commit
e9084768df
1 changed files with 5 additions and 26 deletions
|
@ -14,8 +14,11 @@ class BerkeleyDbAT4 < Formula
|
|||
|
||||
keg_only :versioned_formula
|
||||
|
||||
# Fix build under Xcode 4.6
|
||||
patch :DATA
|
||||
# Fix build with recent clang
|
||||
patch do
|
||||
url "https://raw.githubusercontent.com/Homebrew/formula-patches/4c55b1/berkeley-db%404/clang.diff"
|
||||
sha256 "86111b0965762f2c2611b302e4a95ac8df46ad24925bbb95a1961542a1542e40"
|
||||
end
|
||||
|
||||
def install
|
||||
# BerkeleyDB dislikes parallel builds
|
||||
|
@ -71,27 +74,3 @@ class BerkeleyDbAT4 < Formula
|
|||
assert_predicate testpath/"test.db", :exist?
|
||||
end
|
||||
end
|
||||
|
||||
__END__
|
||||
diff --git a/dbinc/atomic.h b/dbinc/atomic.h
|
||||
index 0034dcc..50b8b74 100644
|
||||
--- a/dbinc/atomic.h
|
||||
+++ b/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;
|
||||
|
|
Loading…
Reference in a new issue