Index: head/databases/rocksdb/Makefile =================================================================== --- head/databases/rocksdb/Makefile (revision 508100) +++ head/databases/rocksdb/Makefile (revision 508101) @@ -1,100 +1,99 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 6.1.2 -PORTREVISION= 1 +PORTVERSION= 6.2.2 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_armv6?= does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') BROKEN_armv7?= does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'` BROKEN_powerpc64= does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libgflags.so:devel/gflags \ libsnappy.so:archivers/snappy OPTIONS_DEFINE= DEBUG LZ4 ZSTD OPTIONS_DEFAULT=LZ4 USES= compiler:c++11-lib gmake localbase:ldflags shebangfix 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 TEST_TARGET= check 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 db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench TOOLS= blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress DEBUG_MAKE_ENV= DEBUG_LEVEL=2 DEBUG_MAKE_ENV_OFF= DEBUG_LEVEL=0 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZ4_MAKE_ENV_OFF= ROCKSDB_DISABLE_LZ4=yes ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MAKE_ENV_OFF= ROCKSDB_DISABLE_ZSTD=yes .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} USE_RTTI=1 DISABLE_JEMALLOC=1 PLIST_SUB+= LITE=${PKGNAMESUFFIX} .endif .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-inconsistent-missing-override .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 .if ${ARCH} != amd64 && ${ARCH} != i386 @${REINPLACE_CMD} -e 's| -march=native||' ${WRKSRC}/build_tools/build_detect_platform .endif @${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-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}/ .include Index: head/databases/rocksdb/distinfo =================================================================== --- head/databases/rocksdb/distinfo (revision 508100) +++ head/databases/rocksdb/distinfo (revision 508101) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559751337 -SHA256 (facebook-rocksdb-v6.1.2_GH0.tar.gz) = df93f3b66caa1cbe1c2862c99c33e18a5c5b24a64fb51dfe8ef805e3c9fd1cad -SIZE (facebook-rocksdb-v6.1.2_GH0.tar.gz) = 5468047 +TIMESTAMP = 1564837219 +SHA256 (facebook-rocksdb-v6.2.2_GH0.tar.gz) = 3e7365cb2a35982e95e5e5dd0b3352dc78573193dafca02788572318c38483fb +SIZE (facebook-rocksdb-v6.2.2_GH0.tar.gz) = 5500603 Index: head/databases/rocksdb/files/patch-tools-db_stress.cc =================================================================== --- head/databases/rocksdb/files/patch-tools-db_stress.cc (nonexistent) +++ head/databases/rocksdb/files/patch-tools-db_stress.cc (revision 508101) @@ -0,0 +1,39 @@ +tools/db_stress.cc:3613:33: error: implicit instantiation of undefined template 'std::__1::array, 10>' + std::array keys = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}; + ^ +/usr/include/c++/v1/__tuple:223:64: note: template is declared here +template struct _LIBCPP_TEMPLATE_VIS array; + ^ +tools/db_stress.cc:3896:30: error: implicit conversion loses integer precision: 'std::__1::vector >::size_type' (aka 'unsigned long') to 'int' [-Werror,-Wshorten-64-to-32] + int num_keys = rand_keys.size(); + ~~~~~~~~ ~~~~~~~~~~^~~~~~ +2 errors generated. + +--- tools/db_stress.cc.orig 2019-06-07 23:23:07 UTC ++++ tools/db_stress.cc +@@ -38,6 +38,7 @@ int main() { + #include + #include + #include ++#include + #include + #include + #include +@@ -3893,7 +3894,7 @@ class AtomicFlushStressTest : public Str + const ReadOptions& read_opts, + const std::vector& rand_column_families, + const std::vector& rand_keys) { +- int num_keys = rand_keys.size(); ++ size_t num_keys = rand_keys.size(); + std::vector key_str; + std::vector keys; + keys.reserve(num_keys); +@@ -3902,7 +3903,7 @@ class AtomicFlushStressTest : public Str + std::vector statuses(num_keys); + ColumnFamilyHandle* cfh = column_families_[rand_column_families[0]]; + +- for (int i = 0; i < num_keys; ++i) { ++ for (size_t i = 0; i < num_keys; ++i) { + key_str.emplace_back(Key(rand_keys[i])); + keys.emplace_back(key_str.back()); + } Property changes on: head/databases/rocksdb/files/patch-tools-db_stress.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