pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/lmdb lmdb: updated to 0.9.23
details: https://anonhg.NetBSD.org/pkgsrc/rev/6004cce7858a
branches: trunk
changeset: 327099:6004cce7858a
user: adam <adam%pkgsrc.org@localhost>
date: Thu Dec 20 17:55:24 2018 +0000
description:
lmdb: updated to 0.9.23
LMDB 0.9.23:
Fix loose pages in dirty list
Fix mdb_load flag init
Fix mdb_env_close in forked process
Documentation
mdb_cursor_del doesn't invalidate cursor
GET_MULTIPLE etc don't change passed in key
diffstat:
databases/lmdb/Makefile | 27 +++++++-----
databases/lmdb/distinfo | 13 ++---
databases/lmdb/patches/patch-libraries_liblmdb_Makefile | 27 ++++++++++-
databases/lmdb/patches/patch-libraries_liblmdb_mdb.c | 36 -----------------
4 files changed, 44 insertions(+), 59 deletions(-)
diffs (149 lines):
diff -r 1cfa5165d51f -r 6004cce7858a databases/lmdb/Makefile
--- a/databases/lmdb/Makefile Thu Dec 20 17:54:09 2018 +0000
+++ b/databases/lmdb/Makefile Thu Dec 20 17:55:24 2018 +0000
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.7 2018/12/09 03:04:34 sevan Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/20 17:55:24 adam Exp $
+
+.include "../../databases/openldap/Makefile.version"
-DISTNAME= LMDB-0.9.18
-PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 1
+# get the version from libraries/liblmdb/lmdb.h
+PKGNAME= lmdb-0.9.23
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GITHUB:=LMDB/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://symas.com/mdb/
COMMENT= Symas Lightning Memory-Mapped Database
-LICENSE= modified-bsd
-
-GITHUB_PROJECT= ${PKGBASE}
-GITHUB_TAG= ${DISTNAME:S/-/_/}
-WRKSRC= ${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
USE_GCC_RUNTIME= yes
USE_TOOLS+= gmake
BUILD_DIRS= libraries/liblmdb
-MAKE_FLAGS+= XCFLAGS=-D_SEM_SEMUN_UNDEFINED
+MAKE_FLAGS+= CC=${CC:Q}
+MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q}\ -D_SEM_SEMUN_UNDEFINED
INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
INSTALLATION_DIRS+= bin
@@ -27,5 +22,13 @@
INSTALLATION_DIRS+= lib
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+TEST_TARGET= test
+
+.include "../../mk/bsd.prefs.mk"
+.if "${OPSYS}" == "Darwin"
+MAKE_FLAGS+= SOEXT=.dylib
+MAKE_FLAGS+= SOLIBS=-install_name\ ${PREFIX}/lib/liblmdb.dylib
+.endif
+
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1cfa5165d51f -r 6004cce7858a databases/lmdb/distinfo
--- a/databases/lmdb/distinfo Thu Dec 20 17:54:09 2018 +0000
+++ b/databases/lmdb/distinfo Thu Dec 20 17:55:24 2018 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/11/25 15:50:13 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2018/12/20 17:55:24 adam Exp $
-SHA1 (LMDB-0.9.18.tar.gz) = 375e31bd0a4d8426e5fc4bfdb00d532c206d4f2b
-RMD160 (LMDB-0.9.18.tar.gz) = 498e2076e9c3e1145d14d83880a54430f20875d8
-SHA512 (LMDB-0.9.18.tar.gz) = 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
-Size (LMDB-0.9.18.tar.gz) = 139156 bytes
-SHA1 (patch-libraries_liblmdb_Makefile) = da5288510ae26b498e1cf8ed453bb1c74f25e54a
-SHA1 (patch-libraries_liblmdb_mdb.c) = 26d1dd1e59b30f8e814bcc3a5d2ff9fd449f83ab
+SHA1 (openldap-2.4.47.tgz) = c59d52dd75f7d1c7b02f83725da36c322d439674
+RMD160 (openldap-2.4.47.tgz) = c228e5d55019c90aaeceeda32980e52cd7a0a4a6
+SHA512 (openldap-2.4.47.tgz) = d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
+Size (openldap-2.4.47.tgz) = 5699678 bytes
+SHA1 (patch-libraries_liblmdb_Makefile) = 6b2f0bb477b17b073095d499ff4496f3b30dc08f
diff -r 1cfa5165d51f -r 6004cce7858a databases/lmdb/patches/patch-libraries_liblmdb_Makefile
--- a/databases/lmdb/patches/patch-libraries_liblmdb_Makefile Thu Dec 20 17:54:09 2018 +0000
+++ b/databases/lmdb/patches/patch-libraries_liblmdb_Makefile Thu Dec 20 17:55:24 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-libraries_liblmdb_Makefile,v 1.3 2016/11/25 15:50:13 fhajny Exp $
+$NetBSD: patch-libraries_liblmdb_Makefile,v 1.4 2018/12/20 17:55:24 adam Exp $
Use proper install commands.
---- libraries/liblmdb/Makefile.orig 2016-02-06 06:22:15.000000000 +0900
-+++ libraries/liblmdb/Makefile 2016-02-16 21:08:37.000000000 +0900
-@@ -48,10 +48,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
+--- libraries/liblmdb/Makefile.orig 2018-12-19 15:57:06.000000000 +0000
++++ libraries/liblmdb/Makefile
+@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
mkdir -p $(DESTDIR)$(libdir)
mkdir -p $(DESTDIR)$(includedir)
mkdir -p $(DESTDIR)$(mandir)/man1
@@ -19,3 +19,22 @@
clean:
rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
+@@ -68,10 +68,14 @@ liblmdb$(SOEXT): mdb.lo midl.lo
+ # $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
+ $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
+
+-mdb_stat: mdb_stat.o liblmdb.a
+-mdb_copy: mdb_copy.o liblmdb.a
+-mdb_dump: mdb_dump.o liblmdb.a
+-mdb_load: mdb_load.o liblmdb.a
++mdb_stat: mdb_stat.o liblmdb${SOEXT}
++ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++mdb_copy: mdb_copy.o liblmdb${SOEXT}
++ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++mdb_dump: mdb_dump.o liblmdb${SOEXT}
++ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++mdb_load: mdb_load.o liblmdb${SOEXT}
++ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
+ mtest: mtest.o liblmdb.a
+ mtest2: mtest2.o liblmdb.a
+ mtest3: mtest3.o liblmdb.a
diff -r 1cfa5165d51f -r 6004cce7858a databases/lmdb/patches/patch-libraries_liblmdb_mdb.c
--- a/databases/lmdb/patches/patch-libraries_liblmdb_mdb.c Thu Dec 20 17:54:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-libraries_liblmdb_mdb.c,v 1.1 2016/11/25 15:50:13 fhajny Exp $
-
-Backport upstream fix for SunOS.
-
-https://github.com/LMDB/lmdb/commit/c367c1f69685a4d307acb8cea6945c1d67e1cc7e.patch
-
-Check for PTHREAD_MUTEX_ROBUST_NP definition (this doesn't work
-on Linux/glibc because they used an enum). Zero out mutex before
-initing.
-
---- libraries/liblmdb/mdb.c.orig 2016-02-05 21:22:15.000000000 +0000
-+++ libraries/liblmdb/mdb.c
-@@ -257,7 +257,8 @@ typedef SSIZE_T ssize_t;
- # else
- # define MDB_USE_ROBUST 1
- /* glibc < 2.12 only provided _np API */
--# if defined(__GLIBC__) && GLIBC_VER < 0x02000c
-+# if (defined(__GLIBC__) && GLIBC_VER < 0x02000c) || \
-+ (defined(PTHREAD_MUTEX_ROBUST_NP) && !defined(PTHREAD_MUTEX_ROBUST))
- # define PTHREAD_MUTEX_ROBUST PTHREAD_MUTEX_ROBUST_NP
- # define pthread_mutexattr_setrobust(attr, flag) pthread_mutexattr_setrobust_np(attr, flag)
- # define pthread_mutex_consistent(mutex) pthread_mutex_consistent_np(mutex)
-@@ -4619,6 +4620,13 @@ mdb_env_setup_locks(MDB_env *env, char *
- #else /* MDB_USE_POSIX_MUTEX: */
- pthread_mutexattr_t mattr;
-
-+ /* Solaris needs this before initing a robust mutex. Otherwise
-+ * it may skip the init and return EBUSY "seems someone already
-+ * inited" or EINVAL "it was inited differently".
-+ */
-+ memset(env->me_txns->mti_rmutex, 0, sizeof(*env->me_txns->mti_rmutex));
-+ memset(env->me_txns->mti_wmutex, 0, sizeof(*env->me_txns->mti_wmutex));
-+
- if ((rc = pthread_mutexattr_init(&mattr))
- || (rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))
- #ifdef MDB_ROBUST_SUPPORTED
Home |
Main Index |
Thread Index |
Old Index