Index: head/databases/rocksdb/Makefile =================================================================== --- head/databases/rocksdb/Makefile (revision 515139) +++ head/databases/rocksdb/Makefile (revision 515140) @@ -1,103 +1,103 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 6.2.4 +PORTVERSION= 6.3.6 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 # Clang 8 detects shadow enums and stops the build. This workaround adds -Wno-error=shadow to bypass it. .if ${COMPILER_VERSION} >= 80 CXXFLAGS+= -Wno-error=shadow .endif .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 515139) +++ head/databases/rocksdb/distinfo (revision 515140) @@ -1,3 +1,3 @@ -TIMESTAMP = 1569607998 -SHA256 (facebook-rocksdb-v6.2.4_GH0.tar.gz) = 7f34d1b55501f5273d11cd064bd34aef87c51ff114452968b86457f06cdb8ced -SIZE (facebook-rocksdb-v6.2.4_GH0.tar.gz) = 5502861 +TIMESTAMP = 1571671533 +SHA256 (facebook-rocksdb-v6.3.6_GH0.tar.gz) = 9878beb4e9b74a5f0d9500772235a39066fd019ba7af9ae6afe483ca713e3c7c +SIZE (facebook-rocksdb-v6.3.6_GH0.tar.gz) = 5573722 Index: head/databases/rocksdb/files/patch-tools-db_stress.cc =================================================================== --- head/databases/rocksdb/files/patch-tools-db_stress.cc (revision 515139) +++ head/databases/rocksdb/files/patch-tools-db_stress.cc (nonexistent) @@ -1,39 +0,0 @@ -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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/rocksdb/files/patch-util-arena.cc =================================================================== --- head/databases/rocksdb/files/patch-util-arena.cc (revision 515139) +++ head/databases/rocksdb/files/patch-util-arena.cc (nonexistent) @@ -1,11 +0,0 @@ ---- util/arena.cc.orig 2018-01-31 01:15:39 UTC -+++ util/arena.cc -@@ -33,7 +33,7 @@ const size_t Arena::kInlineSize; - - const size_t Arena::kMinBlockSize = 4096; - const size_t Arena::kMaxBlockSize = 2u << 30; --static const int kAlignUnit = alignof(max_align_t); -+static const int kAlignUnit = alignof(std::max_align_t); - - size_t OptimizeBlockSize(size_t block_size) { - // Make sure block_size is in optimal range Property changes on: head/databases/rocksdb/files/patch-util-arena.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/rocksdb/files/patch-util-arena.h =================================================================== --- head/databases/rocksdb/files/patch-util-arena.h (revision 515139) +++ head/databases/rocksdb/files/patch-util-arena.h (nonexistent) @@ -1,11 +0,0 @@ ---- util/arena.h.orig 2018-01-31 01:15:39 UTC -+++ util/arena.h -@@ -82,7 +82,7 @@ class Arena : public Allocator { - } - - private: -- char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(max_align_t)))); -+ char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(std::max_align_t)))); - // Number of bytes allocated in one block - const size_t kBlockSize; - // Array of new[] allocated memory blocks Property changes on: head/databases/rocksdb/files/patch-util-arena.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/rocksdb/files/patch-util-arena_test.cc =================================================================== --- head/databases/rocksdb/files/patch-util-arena_test.cc (revision 515139) +++ head/databases/rocksdb/files/patch-util-arena_test.cc (nonexistent) @@ -1,11 +0,0 @@ ---- util/arena_test.cc.orig 2018-01-31 01:15:39 UTC -+++ util/arena_test.cc -@@ -91,7 +91,7 @@ static void ApproximateMemoryUsageTest(s - ASSERT_EQ(kZero, arena.ApproximateMemoryUsage()); - - // allocate inline bytes -- const size_t kAlignUnit = alignof(max_align_t); -+ const size_t kAlignUnit = alignof(std::max_align_t); - EXPECT_TRUE(arena.IsInInlineBlock()); - arena.AllocateAligned(kAlignUnit); - EXPECT_TRUE(arena.IsInInlineBlock()); Property changes on: head/databases/rocksdb/files/patch-util-arena_test.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/rocksdb/files/patch-memory-arena.cc =================================================================== --- head/databases/rocksdb/files/patch-memory-arena.cc (nonexistent) +++ head/databases/rocksdb/files/patch-memory-arena.cc (revision 515140) @@ -0,0 +1,11 @@ +--- memory/arena.cc.orig 2018-01-31 01:15:39 UTC ++++ memory/arena.cc +@@ -33,7 +33,7 @@ const size_t Arena::kInlineSize; + + const size_t Arena::kMinBlockSize = 4096; + const size_t Arena::kMaxBlockSize = 2u << 30; +-static const int kAlignUnit = alignof(max_align_t); ++static const int kAlignUnit = alignof(std::max_align_t); + + size_t OptimizeBlockSize(size_t block_size) { + // Make sure block_size is in optimal range Property changes on: head/databases/rocksdb/files/patch-memory-arena.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/files/patch-memory-arena.h =================================================================== --- head/databases/rocksdb/files/patch-memory-arena.h (nonexistent) +++ head/databases/rocksdb/files/patch-memory-arena.h (revision 515140) @@ -0,0 +1,11 @@ +--- memory/arena.h.orig 2018-01-31 01:15:39 UTC ++++ memory/arena.h +@@ -82,7 +82,7 @@ class Arena : public Allocator { + } + + private: +- char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(max_align_t)))); ++ char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(std::max_align_t)))); + // Number of bytes allocated in one block + const size_t kBlockSize; + // Array of new[] allocated memory blocks Property changes on: head/databases/rocksdb/files/patch-memory-arena.h ___________________________________________________________________ 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/files/patch-memory-arena_test.cc =================================================================== --- head/databases/rocksdb/files/patch-memory-arena_test.cc (nonexistent) +++ head/databases/rocksdb/files/patch-memory-arena_test.cc (revision 515140) @@ -0,0 +1,11 @@ +--- memory/arena_test.cc.orig 2018-01-31 01:15:39 UTC ++++ memory/arena_test.cc +@@ -91,7 +91,7 @@ static void ApproximateMemoryUsageTest(s + ASSERT_EQ(kZero, arena.ApproximateMemoryUsage()); + + // allocate inline bytes +- const size_t kAlignUnit = alignof(max_align_t); ++ const size_t kAlignUnit = alignof(std::max_align_t); + EXPECT_TRUE(arena.IsInInlineBlock()); + arena.AllocateAligned(kAlignUnit); + EXPECT_TRUE(arena.IsInInlineBlock()); Property changes on: head/databases/rocksdb/files/patch-memory-arena_test.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