diff options
| author | joerg <joerg> | 2016-08-26 17:23:16 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2016-08-26 17:23:16 +0000 |
| commit | 7cc25424963a5b218331d6923debb408c7de0f42 (patch) | |
| tree | e16fa37dd31924219f3944ae5fdbf2dca442ec1b /databases/db5 | |
| parent | 0221b6f5bc844f99aac13edb535c2d8673bd0eb8 (diff) | |
| download | pkgsrc-7cc25424963a5b218331d6923debb408c7de0f42.tar.gz | |
Defining a store macro and using <atomic> are mutally conflicting. So
avoid the former for C++.
Diffstat (limited to 'databases/db5')
| -rw-r--r-- | databases/db5/distinfo | 3 | ||||
| -rw-r--r-- | databases/db5/patches/patch-src_dbinc_db.in | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/databases/db5/distinfo b/databases/db5/distinfo index 2482d544aed..f805d0c5a38 100644 --- a/databases/db5/distinfo +++ b/databases/db5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2016/08/26 12:40:25 richard Exp $ +$NetBSD: distinfo,v 1.15 2016/08/26 17:23:16 joerg Exp $ SHA1 (db-5.3.28.tar.gz) = fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9 RMD160 (db-5.3.28.tar.gz) = a4898908ef6dccb137df02e43843f7d3cfab6a3c @@ -9,6 +9,7 @@ SHA1 (patch-ab) = b09fac68d7d847c5660078de90a16f27268e9858 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2 SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0 SHA1 (patch-src_dbinc_atomic.h) = c4fbe421d2c8ba68dc81aeeda1cad09a2c68fbe5 +SHA1 (patch-src_dbinc_db.in) = d20a8c474485811b2e28d54fa5cf2d340d417992 SHA1 (patch-src_mp_mp__fget.c) = c5050193279db979d51d47f5e2c8d7c5cace0fa7 SHA1 (patch-src_mp_mp__mvcc.c) = 2e8b4e5ff7a7534681597261ba82ca08e9231567 SHA1 (patch-src_mp_mp__region.c) = 1c33dc783660515ff24ba018d1ef99cedf9eb3f8 diff --git a/databases/db5/patches/patch-src_dbinc_db.in b/databases/db5/patches/patch-src_dbinc_db.in new file mode 100644 index 00000000000..90fb94b1c99 --- /dev/null +++ b/databases/db5/patches/patch-src_dbinc_db.in @@ -0,0 +1,14 @@ +$NetBSD: patch-src_dbinc_db.in,v 1.1 2016/08/26 17:23:16 joerg Exp $ + +--- src/dbinc/db.in.orig 2016-08-26 13:25:32.335739127 +0000 ++++ src/dbinc/db.in +@@ -2782,7 +2782,9 @@ 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) ++#if !defined(__cplusplus) + #define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#endif + + /******************************************************* + * Hsearch historic interface. |