Index: head/databases/rocksdb/Makefile =================================================================== --- head/databases/rocksdb/Makefile (revision 454514) +++ head/databases/rocksdb/Makefile (revision 454515) @@ -1,107 +1,105 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 5.7.3 -PORTREVISION= 1 -DISTVERSIONPREFIX= ${PORTNAME}- +PORTVERSION= 5.8 +DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER?= sunpoet@FreeBSD.org COMMENT?= Persistent key-value store for fast storage environments LICENSE= APACHE20 GPLv2 LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.Apache LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING BROKEN_DragonFly= does not build on DragonFly BSD using GCC with -Werror BROKEN_aarch64= does not build: the clang compiler does not support -march=native BROKEN_armv6= does not build: the clang compiler does not support -march=native BROKEN_powerpc64= does not build: the clang compiler does not support -march=native BROKEN_sparc64= cannot build: uses unknown compiler flags BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libgflags.so:devel/gflags \ libsnappy.so:archivers/snappy OPTIONS_DEFINE= DEBUG LZ4 ZSTD OPTIONS_DEFAULT=LZ4 ALL_TARGET= shared_lib static_lib all CFLAGS+= -DOS_FREEBSD CONFIGURE_ARGS= make_config.mk CONFIGURE_ENV= PORTABLE=0 ROCKSDB_ROOT=${WRKSRC} CONFIGURE_SCRIPT= build_tools/build_detect_platform HAS_CONFIGURE= yes MAKE_ENV= CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_CXXSTD= c++11 USE_LDCONFIG= yes USES= compiler:c++11-lib gmake localbase:ldflags shebangfix -PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_MAJOR=${PORTVERSION:R:R} SHLIB_MINOR=${PORTVERSION:R:E} PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes SHEBANG_FILES= */*.sh 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 DEBUG_MAKE_ENV_OFF= DEBUG_LEVEL=0 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .if !defined(LITE) CONFLICTS_INSTALL= rocksdb-lite PLIST_SUB+= LITE="" .else PKGNAMESUFFIX= -lite CONFLICTS_INSTALL= rocksdb CFLAGS+= -DROCKSDB_LITE=1 MAKE_ENV+= LIBNAME=librocksdb${PKGNAMESUFFIX} PLIST_SUB+= LITE=${PKGNAMESUFFIX} .endif .include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 CXXFLAGS+= -Wno-inconsistent-missing-override .endif .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 60 CFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: @${REINPLACE_CMD} -e '/^dummy :=/d; /^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's| -fno-builtin-memcmp||; s| -ltcmalloc||' ${WRKSRC}/build_tools/build_detect_platform @${REINPLACE_CMD} -e 's|#include "gtest/gtest.h"|#include "gtest.h"|' ${WRKSRC}/third-party/gtest-1.7.0/fused-src/gtest/gtest-all.cc .if defined(WITHOUT_PROFILE) @${REINPLACE_CMD} -e '/pg = / s| -pg||' ${WRKSRC}/Makefile .endif # Disable SSE4.2 on i386 architecture to fix i386 builds on FreeBSD package building cluster .if ${ARCH} == i386 @${REINPLACE_CMD} -e 's|#ifdef __SSE4_2__|&DISABLED__|' ${WRKSRC}/util/crc32c.cc .endif post-patch-LZ4-off: @${REINPLACE_CMD} -e '/lz4/Id' ${WRKSRC}/build_tools/build_detect_platform post-patch-ZSTD-off: @${REINPLACE_CMD} -e '/zstd/Id' ${WRKSRC}/build_tools/build_detect_platform post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb${PKGNAMESUFFIX}.so ${INSTALL_DATA} ${WRKSRC}/librocksdb${PKGNAMESUFFIX}_tools.a ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ regression-test test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/databases/rocksdb/distinfo =================================================================== --- head/databases/rocksdb/distinfo (revision 454514) +++ head/databases/rocksdb/distinfo (revision 454515) @@ -1,3 +1,3 @@ -TIMESTAMP = 1504161176 -SHA256 (facebook-rocksdb-rocksdb-5.7.3_GH0.tar.gz) = 6256c5d0e95e513f71f5af0a409dab1b3e68f804f12270e687ab195c3ececfd0 -SIZE (facebook-rocksdb-rocksdb-5.7.3_GH0.tar.gz) = 3866209 +TIMESTAMP = 1506701664 +SHA256 (facebook-rocksdb-v5.8_GH0.tar.gz) = d8361d19b3d3e5d7a97c6427b7e39d136541dd88ee58b239ee730bb506a6c9f2 +SIZE (facebook-rocksdb-v5.8_GH0.tar.gz) = 3845839 Index: head/databases/rocksdb/files/patch-utilities-column_aware_encoding_util.cc =================================================================== --- head/databases/rocksdb/files/patch-utilities-column_aware_encoding_util.cc (nonexistent) +++ head/databases/rocksdb/files/patch-utilities-column_aware_encoding_util.cc (revision 454515) @@ -0,0 +1,19 @@ +--- utilities/column_aware_encoding_util.cc.orig 2017-08-30 21:26:12 UTC ++++ utilities/column_aware_encoding_util.cc +@@ -25,6 +25,7 @@ + #include "table/block_based_table_factory.h" + #include "table/format.h" + #include "table/table_reader.h" ++#include "util/cast_util.h" + #include "util/coding.h" + #include "utilities/col_buf_decoder.h" + #include "utilities/col_buf_encoder.h" +@@ -58,7 +59,7 @@ void ColumnAwareEncodingReader::InitTabl + /*skip_filters=*/false), + std::move(file_), file_size, &table_reader, /*enable_prefetch=*/false); + +- table_reader_.reset(dynamic_cast(table_reader.release())); ++ table_reader_.reset(static_cast_with_check(table_reader.release())); + } + + void ColumnAwareEncodingReader::GetKVPairsFromDataBlocks( Property changes on: head/databases/rocksdb/files/patch-utilities-column_aware_encoding_util.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/rocksdb/pkg-plist =================================================================== --- head/databases/rocksdb/pkg-plist (revision 454514) +++ head/databases/rocksdb/pkg-plist (revision 454515) @@ -1,100 +1,100 @@ 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 bin/table_reader_bench bin/write_stress include/rocksdb/advanced_options.h include/rocksdb/c.h include/rocksdb/cache.h include/rocksdb/cleanable.h include/rocksdb/compaction_filter.h include/rocksdb/compaction_job_stats.h include/rocksdb/comparator.h include/rocksdb/convenience.h include/rocksdb/db.h include/rocksdb/db_bench_tool.h include/rocksdb/db_dump_tool.h include/rocksdb/env.h include/rocksdb/env_encryption.h include/rocksdb/experimental.h include/rocksdb/filter_policy.h include/rocksdb/flush_block_policy.h include/rocksdb/iostats_context.h include/rocksdb/iterator.h include/rocksdb/ldb_tool.h include/rocksdb/listener.h include/rocksdb/memtablerep.h include/rocksdb/merge_operator.h include/rocksdb/metadata.h include/rocksdb/options.h include/rocksdb/perf_context.h include/rocksdb/perf_level.h include/rocksdb/persistent_cache.h include/rocksdb/rate_limiter.h include/rocksdb/slice.h include/rocksdb/slice_transform.h include/rocksdb/snapshot.h include/rocksdb/sst_dump_tool.h include/rocksdb/sst_file_manager.h include/rocksdb/sst_file_writer.h include/rocksdb/statistics.h 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/debug.h include/rocksdb/utilities/document_db.h include/rocksdb/utilities/env_librados.h include/rocksdb/utilities/env_mirror.h include/rocksdb/utilities/geo_db.h include/rocksdb/utilities/info_log_finder.h include/rocksdb/utilities/json_document.h include/rocksdb/utilities/ldb_cmd.h include/rocksdb/utilities/ldb_cmd_execute_result.h include/rocksdb/utilities/leveldb_options.h include/rocksdb/utilities/lua/rocks_lua_compaction_filter.h include/rocksdb/utilities/lua/rocks_lua_custom_library.h include/rocksdb/utilities/lua/rocks_lua_util.h include/rocksdb/utilities/memory_util.h include/rocksdb/utilities/object_registry.h include/rocksdb/utilities/optimistic_transaction_db.h include/rocksdb/utilities/option_change_migration.h include/rocksdb/utilities/options_util.h include/rocksdb/utilities/sim_cache.h include/rocksdb/utilities/spatial_db.h include/rocksdb/utilities/stackable_db.h include/rocksdb/utilities/table_properties_collectors.h include/rocksdb/utilities/transaction.h include/rocksdb/utilities/transaction_db.h include/rocksdb/utilities/transaction_db_mutex.h include/rocksdb/utilities/utility_db.h include/rocksdb/utilities/write_batch_with_index.h include/rocksdb/version.h include/rocksdb/wal_filter.h include/rocksdb/write_batch.h include/rocksdb/write_batch_base.h include/rocksdb/write_buffer_manager.h lib/librocksdb%%LITE%%.a lib/librocksdb%%LITE%%.so -lib/librocksdb%%LITE%%.so.%%SHLIB_MAJOR%% -lib/librocksdb%%LITE%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -lib/librocksdb%%LITE%%.so.%%PORTVERSION%% +lib/librocksdb%%LITE%%.so.5 +lib/librocksdb%%LITE%%.so.5.8 +lib/librocksdb%%LITE%%.so.5.8.0 lib/librocksdb%%LITE%%_tools.a