diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index c01c824a77bc..18fc1de57deb 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -1,82 +1,82 @@ PORTNAME= rocksdb -PORTVERSION= 9.11.2 +PORTVERSION= 10.1.3 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-unused-parameter -Wno-unused-variable .if ${COMPILER_VERSION} >= 170 CXXFLAGS+= -Wno-sync-alignment .endif .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 433f851b7cc9..7651257a7046 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744288704 -SHA256 (facebook-rocksdb-v9.11.2_GH0.tar.gz) = 0466a3c220464410687c45930f3fa944052229c894274fddb7d821397f2b8fba -SIZE (facebook-rocksdb-v9.11.2_GH0.tar.gz) = 13713041 +TIMESTAMP = 1745177896 +SHA256 (facebook-rocksdb-v10.1.3_GH0.tar.gz) = df44cbca43d2002726ebbdd5caeae1701dcdf0500d4c2065d6fca261b4706a37 +SIZE (facebook-rocksdb-v10.1.3_GH0.tar.gz) = 13766405 diff --git a/databases/rocksdb/files/patch-aarch64 b/databases/rocksdb/files/patch-aarch64 index d256ce95b119..d316b6ecc85d 100644 --- a/databases/rocksdb/files/patch-aarch64 +++ b/databases/rocksdb/files/patch-aarch64 @@ -1,11 +1,11 @@ ---- util/crc32c_arm64.cc.orig 2024-02-28 00:24:11 UTC +--- util/crc32c_arm64.cc.orig 2025-04-09 18:08:48 UTC +++ util/crc32c_arm64.cc @@ -10,7 +10,7 @@ #if defined(__linux__) #include #endif --#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT +-#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) +#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__) #include #endif #ifndef HWCAP_CRC32 diff --git a/databases/rocksdb/files/patch-db-db_impl-db_impl_write.cc b/databases/rocksdb/files/patch-db-db_impl-db_impl_write.cc deleted file mode 100644 index 865c95e9ce24..000000000000 --- a/databases/rocksdb/files/patch-db-db_impl-db_impl_write.cc +++ /dev/null @@ -1,13 +0,0 @@ -Reference: https://github.com/facebook/rocksdb/commit/1f0426c44b9416d90a90266a87d6a198b5f61627 - ---- db/db_impl/db_impl_write.cc.orig 2024-12-16 20:45:14 UTC -+++ db/db_impl/db_impl_write.cc -@@ -205,7 +205,7 @@ Status DBImpl::IngestWBWI(std::shared_ptrGetColumnFamilySet(); - - // Create WBWIMemTables -- for (const auto [cf_id, stat] : wbwi->GetCFStats()) { -+ for (const auto& [cf_id, stat] : wbwi->GetCFStats()) { - ColumnFamilyData* cfd = cf_set->GetColumnFamily(cf_id); - if (!cfd) { - if (ignore_missing_cf) { diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist index 7fdc61a20cd0..52ddc261829c 100644 --- a/databases/rocksdb/pkg-plist +++ b/databases/rocksdb/pkg-plist @@ -1,136 +1,139 @@ 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_iterator.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/external_table_reader.h +include/rocksdb/external_table.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/multi_scan.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/tool_hooks.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/secondary_index.h include/rocksdb/utilities/secondary_index_faiss.h -include/rocksdb/utilities/secondary_index_options.h +include/rocksdb/utilities/secondary_index_simple.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.10 lib/librocksdb.so.%%SHLIB_VER%% lib/librocksdb.so.%%PORTVERSION%% lib/librocksdb_test.so lib/librocksdb_tools.so libdata/pkgconfig/rocksdb.pc