db: now builds on darwin with libc++-3.8
This commit is contained in:
parent
aa0fa19373
commit
10dae237c6
2 changed files with 17 additions and 1 deletions
|
@ -38,6 +38,19 @@ index 6a858f7..9f338dc 100644
|
||||||
#else
|
#else
|
||||||
#define atomic_inc(env, p) __atomic_inc(env, p)
|
#define atomic_inc(env, p) __atomic_inc(env, p)
|
||||||
#define atomic_dec(env, p) __atomic_dec(env, p)
|
#define atomic_dec(env, p) __atomic_dec(env, p)
|
||||||
|
diff --git a/src/dbinc/db.in b/src/dbinc/db.in
|
||||||
|
index 92ac822..f80428e 100644
|
||||||
|
--- a/src/dbinc/db.in
|
||||||
|
+++ b/src/dbinc/db.in
|
||||||
|
@@ -2782,7 +2782,7 @@ typedef struct {
|
||||||
|
#define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
|
||||||
|
#define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
|
||||||
|
#define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
|
||||||
|
-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
|
||||||
|
+#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
|
||||||
|
|
||||||
|
/*******************************************************
|
||||||
|
* Hsearch historic interface.
|
||||||
diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
|
diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
|
||||||
index 16de695..d0dcc29 100644
|
index 16de695..d0dcc29 100644
|
||||||
--- a/src/mp/mp_fget.c
|
--- a/src/mp/mp_fget.c
|
||||||
|
|
|
@ -3,6 +3,9 @@
|
||||||
import ./generic.nix (args // rec {
|
import ./generic.nix (args // rec {
|
||||||
version = "5.3.28";
|
version = "5.3.28";
|
||||||
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
|
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
|
||||||
extraPatches = [ ./clang-5.3.patch ];
|
|
||||||
branch = "5.3";
|
branch = "5.3";
|
||||||
|
# https://community.oracle.com/thread/3952592
|
||||||
|
# this patch renames some sybols that conflict with libc++-3.8
|
||||||
|
# symbols: atomic_compare_exchange, atomic_init, store
|
||||||
|
extraPatches = [ ./clang-5.3.patch ];
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue