diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index c4a300529cf2..3ddeef8acdb7 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -1,79 +1,79 @@ PORTNAME= rocksdb -PORTVERSION= 9.3.1 +PORTVERSION= 9.4.0 DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= Persistent key-value store for fast storage environments WWW= https://rocksdb.org/ \ https://github.com/facebook/rocksdb 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) #'` BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libgflags.so:devel/gflags \ libsnappy.so:archivers/snappy USES= compiler:c++17-lang gmake localbase:ldflags perl5 USE_PERL5= build 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_RTTI=1 V=1 USE_CXXSTD= c++17 USE_LDCONFIG= yes TEST_TARGET= check PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R} PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes CONFLICTS_INSTALL= rocksdb-lite 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 OPTIONS_DEFINE= DEBUG LZ4 ZSTD OPTIONS_DEFAULT=LZ4 ZSTD 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 .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-inconsistent-missing-override -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field .endif post-patch: .if (${ARCH} == amd64 || ${ARCH} == i386) && !empty(CFLAGS:M-march=*) @${REINPLACE_CMD} -e 's| -march=native| ${CFLAGS:M-march=*}|' ${WRKSRC}/build_tools/build_detect_platform .else @${REINPLACE_CMD} -e 's| -march=native||' ${WRKSRC}/build_tools/build_detect_platform .endif post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so ${INSTALL_LIB} ${WRKSRC}/librocksdb_test.so ${WRKSRC}/librocksdb_tools.so ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ .include diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index 247c91aac6e9..8a48572b4b45 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720022674 -SHA256 (facebook-rocksdb-v9.3.1_GH0.tar.gz) = e63f1be162998c0f49a538a7fe3fcac0e40cad77ee47d5592a65bca50f7c4620 -SIZE (facebook-rocksdb-v9.3.1_GH0.tar.gz) = 13512627 +TIMESTAMP = 1720893168 +SHA256 (facebook-rocksdb-v9.4.0_GH0.tar.gz) = 1f829976aa24b8ba432e156f52c9e0f0bd89c46dc0cc5a9a628ea70571c1551c +SIZE (facebook-rocksdb-v9.4.0_GH0.tar.gz) = 13550643 diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile index f6dd90351cbe..6e5141481e6d 100644 --- a/databases/rocksdb/files/patch-Makefile +++ b/databases/rocksdb/files/patch-Makefile @@ -1,53 +1,55 @@ ---- Makefile.orig 2022-10-05 23:40:03 UTC +--- Makefile.orig 2024-06-24 23:48:34 UTC +++ Makefile -@@ -239,19 +239,19 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA +@@ -91,20 +91,20 @@ $(info $$DEBUG_LEVEL is $(DEBUG_LEVEL), $$LIB_MODE is # Detect what platform we're building on. # Export some common variables that might have been passed as Make variables # instead of environment variables. -dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \ - export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \ - export LDFLAGS="$(EXTRA_LDFLAGS)"; \ - export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \ - export COMPILE_WITH_TSAN="$(COMPILE_WITH_TSAN)"; \ - export COMPILE_WITH_UBSAN="$(COMPILE_WITH_UBSAN)"; \ - export PORTABLE="$(PORTABLE)"; \ - export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ - export USE_CLANG="$(USE_CLANG)"; \ - export LIB_MODE="$(LIB_MODE)"; \ - export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \ - export USE_FOLLY="$(USE_FOLLY)"; \ +- export USE_FOLLY_LITE="$(USE_FOLLY_LITE)"; \ - "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) +#dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \ +# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \ +# export LDFLAGS="$(EXTRA_LDFLAGS)"; \ +# export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \ +# export COMPILE_WITH_TSAN="$(COMPILE_WITH_TSAN)"; \ +# export COMPILE_WITH_UBSAN="$(COMPILE_WITH_UBSAN)"; \ +# export PORTABLE="$(PORTABLE)"; \ +# export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ +# export USE_CLANG="$(USE_CLANG)"; \ +# export LIB_MODE="$(LIB_MODE)"; \ +# export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \ +# export USE_FOLLY="$(USE_FOLLY)"; \ ++# export USE_FOLLY_LITE="$(USE_FOLLY_LITE)"; \ +# "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) # this file is generated by the previous line to set build flags and sources include make_config.mk -@@ -876,7 +876,7 @@ endif # PLATFORM_SHARED_EXT +@@ -884,7 +884,7 @@ endif # PLATFORM_SHARED_EXT rocksdbjavastatic rocksdbjava install install-static install-shared \ uninstall analyze tools tools_lib check-headers checkout_folly -all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS) +all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs # $(TESTS) all_but_some_tests: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(ROCKSDBTESTS_SUBSET) -@@ -1273,7 +1273,7 @@ package: +@@ -1297,7 +1297,7 @@ $(STATIC_LIBRARY): $(LIB_OBJECTS) # Unit tests and tools # --------------------------------------------------------------------------- $(STATIC_LIBRARY): $(LIB_OBJECTS) - $(AM_V_AR)rm -f $@ $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4) -+ $(AM_V_AR)rm -f $@ ++ $(AM_V_AR)rm -f $@ # $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4) $(AM_V_at)$(AR) $(ARFLAGS) $@ $(LIB_OBJECTS) $(STATIC_TEST_LIBRARY): $(TEST_OBJECTS) diff --git a/databases/rocksdb/files/patch-i386 b/databases/rocksdb/files/patch-i386 deleted file mode 100644 index e3c79f624b75..000000000000 --- a/databases/rocksdb/files/patch-i386 +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/facebook/rocksdb/commit/b03d4156609dd27f65ad199139eaae722c876b8c - ---- db_stress_tool/db_stress_common.cc.orig 2024-05-08 23:03:15 UTC -+++ db_stress_tool/db_stress_common.cc -@@ -200,7 +200,7 @@ void CompressedCacheSetCapacityThread(void* v) { - // Lower by upto 50% of usable block cache capacity - adjustment = (adjustment * thread->rand.Uniform(50)) / 100; - block_cache->SetCapacity(capacity - adjustment); -- fprintf(stdout, "New cache capacity = %lu\n", -+ fprintf(stdout, "New cache capacity = %zu\n", - block_cache->GetCapacity()); - db_stress_env->SleepForMicroseconds(10 * 1000 * 1000); - block_cache->SetCapacity(capacity); diff --git a/databases/rocksdb/files/patch-port-stack_trace.cc b/databases/rocksdb/files/patch-port-stack_trace.cc deleted file mode 100644 index f3d3c09689ae..000000000000 --- a/databases/rocksdb/files/patch-port-stack_trace.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- port/stack_trace.cc.orig 2023-09-01 20:58:39 UTC -+++ port/stack_trace.cc -@@ -37,6 +37,7 @@ void* SaveStack(int* /*num_frames*/, int /*first_frame - #endif // OS_OPENBSD - #ifdef OS_FREEBSD - #include -+#include - #endif // OS_FREEBSD - #ifdef OS_LINUX - #include diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist index 7f8a1499d489..9adcd7d2e216 100644 --- a/databases/rocksdb/pkg-plist +++ b/databases/rocksdb/pkg-plist @@ -1,131 +1,132 @@ bin/blob_dump bin/cache_bench bin/db_bench bin/db_repl_stress bin/db_sanity_test bin/db_stress bin/ldb bin/memtablerep_bench bin/persistent_cache_bench bin/range_del_aggregator_bench bin/rocksdb_dump bin/rocksdb_undump bin/sst_dump bin/table_reader_bench bin/trace_analyzer bin/write_stress include/rocksdb/advanced_cache.h include/rocksdb/advanced_options.h include/rocksdb/attribute_groups.h include/rocksdb/block_cache_trace_writer.h include/rocksdb/c.h include/rocksdb/cache.h include/rocksdb/cache_bench_tool.h include/rocksdb/cleanable.h include/rocksdb/compaction_filter.h include/rocksdb/compaction_job_stats.h include/rocksdb/comparator.h include/rocksdb/compression_type.h include/rocksdb/concurrent_task_limiter.h include/rocksdb/configurable.h include/rocksdb/convenience.h include/rocksdb/customizable.h include/rocksdb/data_structure.h include/rocksdb/db.h include/rocksdb/db_bench_tool.h include/rocksdb/db_dump_tool.h include/rocksdb/db_stress_tool.h include/rocksdb/env.h include/rocksdb/env_encryption.h include/rocksdb/experimental.h include/rocksdb/file_checksum.h include/rocksdb/file_system.h include/rocksdb/filter_policy.h include/rocksdb/flush_block_policy.h include/rocksdb/functor_wrapper.h include/rocksdb/io_status.h include/rocksdb/iostats_context.h include/rocksdb/iterator.h include/rocksdb/iterator_base.h include/rocksdb/ldb_tool.h include/rocksdb/listener.h include/rocksdb/memory_allocator.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/port_defs.h include/rocksdb/rate_limiter.h include/rocksdb/rocksdb_namespace.h include/rocksdb/secondary_cache.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_reader.h include/rocksdb/sst_file_writer.h include/rocksdb/sst_partitioner.h include/rocksdb/statistics.h include/rocksdb/stats_history.h include/rocksdb/status.h include/rocksdb/system_clock.h include/rocksdb/table.h include/rocksdb/table_properties.h include/rocksdb/table_reader_caller.h include/rocksdb/thread_status.h include/rocksdb/threadpool.h include/rocksdb/trace_reader_writer.h include/rocksdb/trace_record.h include/rocksdb/trace_record_result.h include/rocksdb/transaction_log.h include/rocksdb/types.h include/rocksdb/unique_id.h include/rocksdb/universal_compaction.h +include/rocksdb/user_write_callback.h include/rocksdb/utilities/agg_merge.h include/rocksdb/utilities/backup_engine.h include/rocksdb/utilities/cache_dump_load.h include/rocksdb/utilities/checkpoint.h include/rocksdb/utilities/convenience.h include/rocksdb/utilities/customizable_util.h include/rocksdb/utilities/db_ttl.h include/rocksdb/utilities/debug.h include/rocksdb/utilities/env_mirror.h include/rocksdb/utilities/info_log_finder.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_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_type.h include/rocksdb/utilities/options_util.h include/rocksdb/utilities/replayer.h include/rocksdb/utilities/sim_cache.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/types_util.h include/rocksdb/utilities/write_batch_with_index.h include/rocksdb/version.h include/rocksdb/wal_filter.h include/rocksdb/wide_columns.h include/rocksdb/write_batch.h include/rocksdb/write_batch_base.h include/rocksdb/write_buffer_manager.h lib/librocksdb.a lib/librocksdb.so lib/librocksdb.so.9 lib/librocksdb.so.%%SHLIB_VER%% lib/librocksdb.so.%%PORTVERSION%% lib/librocksdb_test.so lib/librocksdb_tools.so libdata/pkgconfig/rocksdb.pc