git: b0391241ed62 - main - databases/rocksdb: Update to 9.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 13 Jul 2024 20:41:03 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b0391241ed62a6ef7c5441164d6b1cd3feb8b39a
commit b0391241ed62a6ef7c5441164d6b1cd3feb8b39a
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-07-13 20:17:34 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-07-13 20:17:34 +0000
databases/rocksdb: Update to 9.4.0
Changes: https://github.com/facebook/rocksdb/releases
---
databases/rocksdb/Makefile | 2 +-
databases/rocksdb/distinfo | 6 +++---
databases/rocksdb/files/patch-Makefile | 12 +++++++-----
databases/rocksdb/files/patch-i386 | 13 -------------
databases/rocksdb/files/patch-port-stack_trace.cc | 10 ----------
databases/rocksdb/pkg-plist | 1 +
6 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index c4a300529cf2..3ddeef8acdb7 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rocksdb
-PORTVERSION= 9.3.1
+PORTVERSION= 9.4.0
DISTVERSIONPREFIX= v
CATEGORIES= databases
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,6 +1,6 @@
---- 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.
@@ -16,6 +16,7 @@
- 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)"; \
@@ -29,11 +30,12 @@
+# 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
@@ -42,12 +44,12 @@
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 <sys/sysctl.h>
-+#include <sys/wait.h>
- #endif // OS_FREEBSD
- #ifdef OS_LINUX
- #include <sys/prctl.h>
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
@@ -85,6 +85,7 @@ 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