ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 20:02:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21049 from LnL7/db-dbmsupport

Browse Source 
db: disable dbm support by default
This commit is contained in:
Daiderd Jordan 2017-01-23 22:23:07 +01:00 committed by GitHub
commit dca3a4e3f4
4 changed files with 8 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/db/clang-4.8.patch
View File

@ -38,19 +38,6 @@ index 0034dcc..160c8ea 100644
#else
#define atomic_inc(env, p) __atomic_inc(env, p)
#define atomic_dec(env, p) __atomic_dec(env, p)
diff --git a/dbinc/db.in b/dbinc/db.in
index 9fc6712..7428e0a 100644
--- a/dbinc/db.in
+++ b/dbinc/db.in
@@ -2413,7 +2413,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/mp/mp_fget.c b/mp/mp_fget.c
index 5fdee5a..0b75f57 100644
--- a/mp/mp_fget.c

13
pkgs/development/libraries/db/clang-5.3.patch
View File

@ -38,19 +38,6 @@ 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

13
pkgs/development/libraries/db/clang-6.0.patch
View File

@ -20,19 +20,6 @@ index e4420aa..4799b5f 100644
#else
#define atomic_inc(env, p) __atomic_inc_int(env, p)
#define atomic_dec(env, p) __atomic_dec_int(env, p)
diff --git a/src/dbinc/db.in b/src/dbinc/db.in
index 3c2ad9b..3e46f02 100644
--- a/src/dbinc/db.in
+++ b/src/dbinc/db.in
@@ -2999,7 +2999,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 59fe9fe..fa4ced7 100644
--- a/src/mp/mp_fget.c

14
pkgs/development/libraries/db/generic.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl
, cxxSupport ? true
, compat185 ? true
, dbmSupport ? false
# Options from inherited versions
, version, sha256
@ -19,12 +20,13 @@ stdenv.mkDerivation (rec {
patches = extraPatches;
configureFlags = [
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185")
"--enable-dbm"
(stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic")
];
configureFlags =
[
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185")
]
++ stdenv.lib.optional dbmSupport "--enable-dbm"
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
preConfigure = ''
cd build_unix