[pkgsrc/trunk]: pkgsrc/databases/leveldb leveldb: updated to 1.22

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/databases/leveldb leveldb: updated to 1.22
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 05 Jun 2019 14:21:31 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd1b470f46ec
branches:  trunk
changeset: 334790:fd1b470f46ec
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 05 13:22:04 2019 +0000

description:
leveldb: updated to 1.22

Release 1.22
Corrected formatting to be compliant with the Google C++ Style Guide.
Specifically export the WriteBatch::Handler inner class for Windows link.
Merge pull request 665 from cheng-chang:coding.
Merge pull request 669 from pavel-pimenov:fix-readme-windows-mkdir.
Merge pull request 472 from zhoudayang:patch-1.
Merge pull request 339 from richcole-at-amazon:master.
Restore soname versioning with CMake build.
Other miscellaneous cleanups, fixes, and improvements.

Release 1.21
Switched to using Copybara for project synchronization.
Minor cleanup in ports.
Silence unused argument warnings in MSVC.
Add tests for empty keys and values.
Switch corruption_test to use InMemEnv.
Replace AtomicPointer with std::atomic.
Make InMemoryEnv more consistent with filesystem based Env's.
Align windows_logger with posix_logger.
Improve CI configuration and added AppVeyor (Windows CI) badge to README.
Added native support for Windows.
Make WriteBatch::ApproximateSize() const.
Fix PosixWritableFile::Sync() on Apple systems.
Fix fdatasync() feature detection in opensource build.
C++11 cleanup for util/mutexlock.h.
Rework threading in env_posix.cc.
Remove InitOnce from the port API.
Expose WriteBatch::Append().
Fix documentation for log file growth.
Add move constructor to Status.
Replace port_posix with port_stdcxx.
Reimplement ConsumeDecimalNumber.
Document the building process.
Replace NULL with nullptr in C++ files.
Remove PLATFORM_IS_LITTLE_ENDIAN from port/posix.h.
Add more thread safety annotations.
Require C++11.
Replace SIZE_MAX with std::numeric_limits.
Add CMake build support.
Enable thread safety annotations.
leveldb::DestroyDB will now delete empty directories.
Replace SSE-optimized CRC32C in POSIX port with external library.
Fix file writing bug in CL 170738066.
Fix use of uninitialized value in LRUHandle.
Fix issue 474: a race between the f*_unlocked() STDIO calls in env_posix.cc and concurrent application calls to fflush(NULL).
Use __APPLE__ instead of OS_MACOS. The former is compiler-provided.
Report missing CURRENT manifest file as database corruption.
LevelDB: Add WriteBatch::ApproximateSize().
Other minor fixes, code cleanup, and documentation improvements.

diffstat:

 databases/leveldb/Makefile                              |  47 ++--------------
 databases/leveldb/PLIST                                 |  19 ++----
 databases/leveldb/distinfo                              |  12 +--
 databases/leveldb/options.mk                            |  13 ----
 databases/leveldb/patches/patch-aa                      |  21 -------
 databases/leveldb/patches/patch-build__detect__platform |  13 ----
 6 files changed, 18 insertions(+), 107 deletions(-)

diffs (175 lines):

diff -r 46ea34464268 -r fd1b470f46ec databases/leveldb/Makefile
--- a/databases/leveldb/Makefile        Wed Jun 05 13:10:57 2019 +0000
+++ b/databases/leveldb/Makefile        Wed Jun 05 13:22:04 2019 +0000
@@ -1,51 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2017/03/14 13:12:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/06/05 13:22:04 adam Exp $
 
-DISTNAME=      leveldb-1.20
+DISTNAME=      leveldb-1.22
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    mishka%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/google/leveldb
 COMMENT=       Fast and lightweight key/value database library by Google
 LICENSE=       modified-bsd
 
-USE_LANGUAGES+=        c c++
-USE_TOOLS+=    gmake pax
-
-INSTALLATION_DIRS+=    bin include/leveldb lib share/doc/leveldb
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-SS=            dylib
-.else
-SS=            so
-.endif
-
-MAJOR=         ${PKGVERSION_NOREV:R}
-MINOR=         ${PKGVERSION_NOREV:E}
-
-# N.B.: leveldb Darwin support follows popular Unix .so naming convention
-SS.M=          ${SS}.${MAJOR}
-SS.M.N=                ${SS}.${MAJOR}.${MINOR}
+USE_CMAKE=     yes
+USE_LANGUAGES+=        c c++11
+CMAKE_ARGS+=   -DLEVELDB_BUILD_BENCHMARKS=OFF
+TEST_TARGET=   test
 
-PLIST_SUBST+=  SS=${SS:Q} SS.M=${SS.M:Q} SS.M.N=${SS.M.N:Q}
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/out-static/leveldbutil ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/out-static/db_bench                                \
-               ${DESTDIR}${PREFIX}/bin/leveldb_bench
-
-       ${INSTALL_LIB} ${WRKSRC}/out-static/libleveldb.a ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_LIB} ${WRKSRC}/out-shared/libleveldb.${SS.M.N} ${DESTDIR}${PREFIX}/lib
-       ${LN} -s libleveldb.${SS.M.N} ${DESTDIR}${PREFIX}/lib/libleveldb.${SS.M}
-       ${LN} -s libleveldb.${SS.M} ${DESTDIR}${PREFIX}/lib/libleveldb.${SS}
-
-       ${INSTALL_DATA} ${WRKSRC}/include/leveldb/*                     \
-               ${DESTDIR}${PREFIX}/include/leveldb
-
-       cd ${WRKSRC}/doc && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/doc/leveldb
-
-.include "options.mk"
+.include "../../devel/snappy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 46ea34464268 -r fd1b470f46ec databases/leveldb/PLIST
--- a/databases/leveldb/PLIST   Wed Jun 05 13:10:57 2019 +0000
+++ b/databases/leveldb/PLIST   Wed Jun 05 13:22:04 2019 +0000
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2017/03/14 13:12:28 wiz Exp $
-bin/leveldb_bench
-bin/leveldbutil
+@comment $NetBSD: PLIST,v 1.2 2019/06/05 13:22:04 adam Exp $
 include/leveldb/c.h
 include/leveldb/cache.h
 include/leveldb/comparator.h
 include/leveldb/db.h
 include/leveldb/dumpfile.h
 include/leveldb/env.h
+include/leveldb/export.h
 include/leveldb/filter_policy.h
 include/leveldb/iterator.h
 include/leveldb/options.h
@@ -15,14 +14,8 @@
 include/leveldb/table.h
 include/leveldb/table_builder.h
 include/leveldb/write_batch.h
+lib/cmake/leveldb/leveldbConfig.cmake
+lib/cmake/leveldb/leveldbConfigVersion.cmake
+lib/cmake/leveldb/leveldbTargets-noconfig.cmake
+lib/cmake/leveldb/leveldbTargets.cmake
 lib/libleveldb.a
-lib/libleveldb.${SS}
-lib/libleveldb.${SS.M}
-lib/libleveldb.${SS.M.N}
-share/doc/leveldb/bench/db_bench_sqlite3.cc
-share/doc/leveldb/bench/db_bench_tree_db.cc
-share/doc/leveldb/benchmark.html
-share/doc/leveldb/impl.md
-share/doc/leveldb/index.md
-share/doc/leveldb/log_format.md
-share/doc/leveldb/table_format.md
diff -r 46ea34464268 -r fd1b470f46ec databases/leveldb/distinfo
--- a/databases/leveldb/distinfo        Wed Jun 05 13:10:57 2019 +0000
+++ b/databases/leveldb/distinfo        Wed Jun 05 13:22:04 2019 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/04/27 17:04:56 joerg Exp $
+$NetBSD: distinfo,v 1.3 2019/06/05 13:22:04 adam Exp $
 
-SHA1 (leveldb-1.20.tar.gz) = df11440c30deed5987263730180225db98de9f57
-RMD160 (leveldb-1.20.tar.gz) = 9cc7db3d8c80e11659bafe02e3efe7a03f98369d
-SHA512 (leveldb-1.20.tar.gz) = c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
-Size (leveldb-1.20.tar.gz) = 223141 bytes
-SHA1 (patch-aa) = 66a727ab380538bf01f4d472cdad0eeccddff544
-SHA1 (patch-build__detect__platform) = 6e1b8d93b3c5ae6d521222fa0c53375fb528a08a
+SHA1 (leveldb-1.22.tar.gz) = 8d310af5cfb53dc836bfb412ff4b3c8aea578627
+RMD160 (leveldb-1.22.tar.gz) = 8ecf3f0bbac39388964623094cefe33137be6ce9
+SHA512 (leveldb-1.22.tar.gz) = f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab
+Size (leveldb-1.22.tar.gz) = 239365 bytes
diff -r 46ea34464268 -r fd1b470f46ec databases/leveldb/options.mk
--- a/databases/leveldb/options.mk      Wed Jun 05 13:10:57 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2017/03/14 13:12:28 wiz Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.leveldb
-PKG_SUPPORTED_OPTIONS= snappy
-PKG_SUGGESTED_OPTIONS= snappy
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=           snappy
-
-.if !empty(PKG_OPTIONS:Msnappy)
-.include "../../devel/snappy/buildlink3.mk"
-.endif
diff -r 46ea34464268 -r fd1b470f46ec databases/leveldb/patches/patch-aa
--- a/databases/leveldb/patches/patch-aa        Wed Jun 05 13:10:57 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2017/03/14 13:12:28 wiz Exp $
-
-Try to be platform agnostic during endianness detection.
-https://code.google.com/p/leveldb/issues/detail?id=137
-
---- port/port_posix.h.orig     2012-12-27 18:32:31.000000000 +0000
-+++ port/port_posix.h
-@@ -7,6 +7,13 @@
- #ifndef STORAGE_LEVELDB_PORT_PORT_POSIX_H_
- #define STORAGE_LEVELDB_PORT_PORT_POSIX_H_
- 
-+#ifndef __BYTE_ORDER
-+#define __BYTE_ORDER  _BYTE_ORDER
-+#endif
-+#ifndef __LITTLE_ENDIAN
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#endif
-+
- #undef PLATFORM_IS_LITTLE_ENDIAN
- #if defined(OS_MACOSX)
-   #include <machine/endian.h>
diff -r 46ea34464268 -r fd1b470f46ec databases/leveldb/patches/patch-build__detect__platform
--- a/databases/leveldb/patches/patch-build__detect__platform   Wed Jun 05 13:10:57 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-build__detect__platform,v 1.1 2017/04/27 17:04:56 joerg Exp $
-
---- build_detect_platform.orig 2017-04-22 23:02:04.756517625 +0000
-+++ build_detect_platform
-@@ -113,7 +113,7 @@ case "$TARGET_OS" in
-     NetBSD)
-         PLATFORM=OS_NETBSD
-         COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_NETBSD"
--        PLATFORM_LIBS="-lpthread -lgcc_s"
-+        PLATFORM_LIBS="-lpthread"
-         PORT_FILE=port/port_posix.cc
-         PORT_SSE_FILE=port/port_posix_sse.cc
-         ;;
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/rawtherapee Update to 5.6
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated databases/leveldb
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/rawtherapee Update to 5.6
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated databases/leveldb
Indexes:
Home | Main Index | Thread Index | Old Index