Date: Tue, 13 Dec 2016 17:50:13 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428521 - in head/databases/rocksdb: . files Message-ID: <201612131750.uBDHoDQ5046811@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Tue Dec 13 17:50:13 2016 New Revision: 428521 URL: https://svnweb.freebsd.org/changeset/ports/428521 Log: - Update to 4.13 (4.13.4) - Use upstream install target instead of handmade one - Respect upstream shlib version Changes: https://github.com/facebook/rocksdb/releases Added: head/databases/rocksdb/files/ head/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc (contents, props changed) head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc (contents, props changed) head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc (contents, props changed) Modified: head/databases/rocksdb/Makefile head/databases/rocksdb/distinfo head/databases/rocksdb/pkg-plist Modified: head/databases/rocksdb/Makefile ============================================================================== --- head/databases/rocksdb/Makefile Tue Dec 13 17:50:08 2016 (r428520) +++ head/databases/rocksdb/Makefile Tue Dec 13 17:50:13 2016 (r428521) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 4.11.2 +PORTVERSION= 4.13 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -31,7 +30,7 @@ CONFIGURE_ARGS= make_config.mk CONFIGURE_ENV= ROCKSDB_ROOT=${WRKSRC} CONFIGURE_SCRIPT= build_tools/build_detect_platform CPPFLAGS+= -DOS_FREEBSD -MAKE_ENV= CXX=${CXX} +MAKE_ENV= CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_CXXSTD= c++11 USE_LDCONFIG= yes USES= compiler:c++11-lib gmake localbase:ldflags @@ -41,7 +40,7 @@ PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes -BENCHMARKS= cache_bench db_bench memtablerep_bench table_reader_bench +BENCHMARKS= cache_bench column_aware_encoding_exp db_bench memtablerep_bench persistent_cache_bench table_reader_bench TOOLS= db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump write_stress DEBUG_MAKE_ENV= DEBUG_LEVEL=2 @@ -77,13 +76,11 @@ post-patch-LZ4-off: post-patch-ZSTD-off: @${REINPLACE_CMD} -e '/zstd/Id' ${WRKSRC}/build_tools/build_detect_platform -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/include/rocksdb/ ${STAGEDIR}${DATADIR}/ +post-install: + ${MKDIR} ${STAGEDIR}${DATADIR}/ cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/include/rocksdb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/rocksdb/ - ${INSTALL_DATA} ${WRKSRC}/librocksdb.a ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/librocksdb.so ${STAGEDIR}${PREFIX}/lib/librocksdb.so.0 - ${LN} -fs librocksdb.so.0 ${STAGEDIR}${PREFIX}/lib/librocksdb.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so + ${INSTALL_DATA} ${WRKSRC}/librocksdb_tools.a ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ regression-test test: build Modified: head/databases/rocksdb/distinfo ============================================================================== --- head/databases/rocksdb/distinfo Tue Dec 13 17:50:08 2016 (r428520) +++ head/databases/rocksdb/distinfo Tue Dec 13 17:50:13 2016 (r428521) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479552145 -SHA256 (facebook-rocksdb-v4.11.2_GH0.tar.gz) = 9374be06fdfccbbdbc60de90b72b5db7040e1bc4e12532e4c67aaec8181b45be -SIZE (facebook-rocksdb-v4.11.2_GH0.tar.gz) = 2270731 +TIMESTAMP = 1481632386 +SHA256 (facebook-rocksdb-v4.13_GH0.tar.gz) = 423ca51df17c8b763a339920499028dec37014210a59c0d302310b2a04a96514 +SIZE (facebook-rocksdb-v4.13_GH0.tar.gz) = 2880432 Added: head/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc Tue Dec 13 17:50:13 2016 (r428521) @@ -0,0 +1,10 @@ +--- utilities/column_aware_encoding_exp.cc.orig 2016-12-09 20:59:51 UTC ++++ utilities/column_aware_encoding_exp.cc +@@ -8,6 +8,7 @@ + #endif + + #include <cstdio> ++#include <cstdlib> + + #ifndef ROCKSDB_LITE + #ifdef GFLAGS Added: head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc Tue Dec 13 17:50:13 2016 (r428521) @@ -0,0 +1,16 @@ +Obtained from: https://github.com/facebook/rocksdb/commit/85bd8f518b55782f2fada586eabc953df15478e1 + +--- utilities/persistent_cache/hash_table_bench.cc.orig 2016-12-09 20:59:51 UTC ++++ utilities/persistent_cache/hash_table_bench.cc +@@ -272,9 +272,9 @@ class GranularLockImpl : public HashTabl + // main + // + int main(int argc, char** argv) { +- google::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + ++ GFLAGS::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + + " [OPTIONS]..."); +- google::ParseCommandLineFlags(&argc, &argv, false); ++ GFLAGS::ParseCommandLineFlags(&argc, &argv, false); + + // + // Micro benchmark unordered_map Added: head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc Tue Dec 13 17:50:13 2016 (r428521) @@ -0,0 +1,16 @@ +Obtained from: https://github.com/facebook/rocksdb/commit/85bd8f518b55782f2fada586eabc953df15478e1 + +--- utilities/persistent_cache/persistent_cache_bench.cc.orig 2016-12-09 20:59:51 UTC ++++ utilities/persistent_cache/persistent_cache_bench.cc +@@ -302,9 +302,9 @@ class CacheTierBenchmark { + // main + // + int main(int argc, char** argv) { +- google::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + ++ GFLAGS::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + + " [OPTIONS]..."); +- google::ParseCommandLineFlags(&argc, &argv, false); ++ GFLAGS::ParseCommandLineFlags(&argc, &argv, false); + + std::ostringstream msg; + msg << "Config" << std::endl Modified: head/databases/rocksdb/pkg-plist ============================================================================== --- head/databases/rocksdb/pkg-plist Tue Dec 13 17:50:08 2016 (r428520) +++ head/databases/rocksdb/pkg-plist Tue Dec 13 17:50:13 2016 (r428521) @@ -1,10 +1,12 @@ bin/cache_bench +bin/column_aware_encoding_exp bin/db_bench bin/db_repl_stress bin/db_sanity_test bin/db_stress bin/ldb bin/memtablerep_bench +bin/persistent_cache_bench bin/rocksdb_dump bin/rocksdb_undump bin/sst_dump @@ -23,7 +25,6 @@ include/rocksdb/env.h include/rocksdb/experimental.h include/rocksdb/filter_policy.h include/rocksdb/flush_block_policy.h -include/rocksdb/immutable_options.h include/rocksdb/iostats_context.h include/rocksdb/iterator.h include/rocksdb/ldb_tool.h @@ -47,18 +48,19 @@ include/rocksdb/status.h include/rocksdb/table.h include/rocksdb/table_properties.h include/rocksdb/thread_status.h +include/rocksdb/threadpool.h include/rocksdb/transaction_log.h include/rocksdb/types.h include/rocksdb/universal_compaction.h include/rocksdb/utilities/backupable_db.h include/rocksdb/utilities/checkpoint.h include/rocksdb/utilities/convenience.h +include/rocksdb/utilities/date_tiered_db.h include/rocksdb/utilities/db_ttl.h include/rocksdb/utilities/document_db.h include/rocksdb/utilities/env_librados.h include/rocksdb/utilities/env_mirror.h include/rocksdb/utilities/env_registry.h -include/rocksdb/utilities/flashcache.h include/rocksdb/utilities/geo_db.h include/rocksdb/utilities/info_log_finder.h include/rocksdb/utilities/json_document.h @@ -85,4 +87,7 @@ include/rocksdb/write_batch_base.h include/rocksdb/write_buffer_manager.h lib/librocksdb.a lib/librocksdb.so -lib/librocksdb.so.0 +lib/librocksdb.so.4 +lib/librocksdb.so.4.13 +lib/librocksdb.so.4.13.4 +lib/librocksdb_tools.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612131750.uBDHoDQ5046811>