diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-09-14 00:05:58 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2016-09-14 00:05:58 +0200 |
| commit | 10dae237c6364576e926dc72fc559b94a2d30ad4 (patch) | |
| tree | f36123ce233bd5f8ea15434c9b532954ea0928c8 /pkgs/development/libraries | |
| parent | aa0fa193734a0bb9c1ee156317008d7409647bdf (diff) | |
| download | nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.tar nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.tar.gz nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.tar.bz2 nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.tar.lz nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.tar.xz nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.tar.zst nixlib-10dae237c6364576e926dc72fc559b94a2d30ad4.zip | |
db: now builds on darwin with libc++-3.8
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/db/clang-5.3.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/db/db-5.3.nix | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 635b9dc076ae..0a0993da13e1 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -38,6 +38,19 @@ index 6a858f7..9f338dc 100644 #else #define atomic_inc(env, p) __atomic_inc(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 index 16de695..d0dcc29 100644 --- a/src/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 98002c244612..91adfa24b58d 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,9 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ]; 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 ]; }) |