From 666ee148510b2b5f5c13b20de777106bdee872ae Mon Sep 17 00:00:00 2001 From: Xin LI Date: Sat, 7 Dec 2019 22:47:43 +0000 Subject: [PATCH] - Drop support of FreeBSD < 11.0 - Make use of robust mutexes. --- databases/lmdb/Makefile | 1 + databases/lmdb/files/patch-mdb.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index fd1e86bd1785..9d9ab27c8371 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -3,6 +3,7 @@ PORTNAME= lmdb PORTVERSION= 0.9.24 +PORTREVISION= 1 DISTVERSIONPREFIX= ${PORTNAME:tu}_ PORTEPOCH= 1 CATEGORIES= databases diff --git a/databases/lmdb/files/patch-mdb.c b/databases/lmdb/files/patch-mdb.c index 5194cbbeb91a..bd13791fc88b 100644 --- a/databases/lmdb/files/patch-mdb.c +++ b/databases/lmdb/files/patch-mdb.c @@ -1,11 +1,14 @@ ---- mdb.c.orig 2017-06-01 16:51:10 UTC +--- mdb.c.orig 2019-07-19 16:41:12 UTC +++ mdb.c -@@ -125,6 +125,8 @@ typedef SSIZE_T ssize_t; - # define MDB_FDATASYNC fsync - #elif defined(ANDROID) - # define MDB_FDATASYNC fsync -+#elif defined(__FreeBSD_version) && __FreeBSD_version < 1101000 -+# define MDB_FDATASYNC fsync +@@ -124,7 +124,10 @@ typedef SSIZE_T ssize_t; + #include /* defines BYTE_ORDER on HPUX and Solaris */ #endif - #ifndef _WIN32 +-#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) ++#if defined(__FreeBSD__) ++# define MDB_USE_POSIX_MUTEX 1 ++# define MDB_USE_ROBUST 1 ++#elif defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) + # define MDB_USE_POSIX_SEM 1 + # define MDB_FDATASYNC fsync + #elif defined(ANDROID)