diff options
| author | janus <janus@xn--kn-1ia.guru> | 2015-11-24 10:59:39 +0000 |
|---|---|---|
| committer | janus <janus@xn--kn-1ia.guru> | 2016-01-01 16:59:48 +0000 |
| commit | a1ade02cdc75a11013c49ad12c7bb4feeec0d080 (patch) | |
| tree | f7969d9daf6d3e1aebabdf0c085d52a0a0996ca9 /pkgs/development/libraries/db | |
| parent | 35cf6c428f05c522a4987d144c8bd5abe6b2f468 (diff) | |
| download | nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.tar nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.tar.gz nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.tar.bz2 nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.tar.lz nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.tar.xz nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.tar.zst nixlib-a1ade02cdc75a11013c49ad12c7bb4feeec0d080.zip | |
FreeBSD support
Diffstat (limited to 'pkgs/development/libraries/db')
| -rw-r--r-- | pkgs/development/libraries/db/clang-4.8.patch | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/db/clang-5.3.patch (renamed from pkgs/development/libraries/db/osx.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/db/db-4.8.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/db/db-5.3.nix | 2 |
4 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch new file mode 100644 index 000000000000..c53160a82970 --- /dev/null +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -0,0 +1,22 @@ +diff --git a/dbinc/atomic.h b/dbinc/atomic.h +index 0034dcc..fa7ba93 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)) ++ __db_atomic_compare_exchange((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 __db_atomic_compare_exchange( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; diff --git a/pkgs/development/libraries/db/osx.patch b/pkgs/development/libraries/db/clang-5.3.patch index 438fa7eedd71..438fa7eedd71 100644 --- a/pkgs/development/libraries/db/osx.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 9b5e8cb39bda..6a161b0b72d8 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -2,6 +2,7 @@ import ./generic.nix (args // rec { version = "4.8.30"; + extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; branch = "4.8"; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index b5e62ee686f0..98002c244612 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,6 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./osx.patch ]; + extraPatches = [ ./clang-5.3.patch ]; branch = "5.3"; }) |