Date: Mon, 3 Sep 2018 12:08:41 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478856 - in head/databases/lmdb: . files Message-ID: <201809031208.w83C8fsc003515@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Sep 3 12:08:40 2018 New Revision: 478856 URL: https://svnweb.freebsd.org/changeset/ports/478856 Log: databases/lmdb: back out r478269 due to cyrus-imapd30 instability Robust mutexes were already enabled but r478269 disabled POSIX semaphores. It appears both are only mutually exclusive on Android and old GNU libc. PR: 230564 Reported by: Volodymyr Kostyrko Pointy hat to: jbeich Modified: head/databases/lmdb/Makefile (contents, props changed) head/databases/lmdb/files/patch-mdb.c (contents, props changed) Modified: head/databases/lmdb/Makefile ============================================================================== --- head/databases/lmdb/Makefile Mon Sep 3 11:51:38 2018 (r478855) +++ head/databases/lmdb/Makefile Mon Sep 3 12:08:40 2018 (r478856) @@ -4,7 +4,7 @@ PORTNAME= lmdb PORTVERSION= 0.9.22 DISTVERSIONPREFIX= ${PORTNAME:tu}_ -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= databases Modified: head/databases/lmdb/files/patch-mdb.c ============================================================================== --- head/databases/lmdb/files/patch-mdb.c Mon Sep 3 11:51:38 2018 (r478855) +++ head/databases/lmdb/files/patch-mdb.c Mon Sep 3 12:08:40 2018 (r478856) @@ -1,23 +1,11 @@ -- NetBSD has fdatasync(2), see https://github.com/NetBSD/src/commit/e963c41c6fb9 -- OpenBSD has fdatasync(3), see https://github.com/openbsd/src/commit/aa96fc3dc04f -- FreeBSD 11.0 has robust mutexes (see base r300043) and 11.1 has fdatasync(2) (see base r304977) - ---- mdb.c.orig 2018-03-22 15:23:05 UTC +--- mdb.c.orig 2017-06-01 16:51:10 UTC +++ mdb.c -@@ -124,11 +124,12 @@ typedef SSIZE_T ssize_t; - #include <resolv.h> /* defines BYTE_ORDER on HPUX and Solaris */ - #endif - --#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) --# define MDB_USE_POSIX_SEM 1 -+#if defined(__APPLE__) || defined(ANDROID) || defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ < 11) +@@ -125,6 +125,8 @@ typedef SSIZE_T ssize_t; # define MDB_FDATASYNC fsync --#elif defined(ANDROID) --# define MDB_FDATASYNC fsync -+#endif -+ -+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ < 11) -+# define MDB_USE_POSIX_SEM 1 + #elif defined(ANDROID) + # define MDB_FDATASYNC fsync ++#elif defined(__FreeBSD_version) && __FreeBSD_version < 1101000 ++# define MDB_FDATASYNC fsync #endif #ifndef _WIN32
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809031208.w83C8fsc003515>