From nobody Sat Jul 13 20:41:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WM0jW39KGz5R5T0; Sat, 13 Jul 2024 20:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WM0jW2fc2z45JW; Sat, 13 Jul 2024 20:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720903263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ad3wOtO6YNvgmzKxto5uv628UpOoc6FKZKFP+CHKgmA=; b=n9eLatRfE+zvldyAPjAxoklG2UJ/284pQI0gs/X5b8c2/+Dc9+y7G6F2fwibYl1luXH1Xo 8qJfp0PjvTlsQjv86RG0LX/JaScaCVHWScBakr9YM9FA5zmwHTyUOn0/VkV5DcKp68n6In q7kwoG/tmPzGeKvpaWhgqKxD8KTWkk3MSXrqvzxXjbxLtoA9Tfs3KREOjTPoPalR0Gt5QJ ucuiRVL+CybRS9zF0N9Mx9YQc7y0WwuGd843zAZrQ1t264ftgYzMYHvA8or+HvT5m+T/NL OVQE9xW0TcjCL3G+GcT83sv+RoMmbE7sBYh2FG0xy4xnWX75oguktJvaJYpFqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720903263; a=rsa-sha256; cv=none; b=Nedc9XsbEU/91ICkJQRYlpGYBUUKuAg7SQ85sLGJ8Bo+YCMVwLzvur21eZVr4TlhXcaCXw I7Q0Voy+yDHZNX5DhGlLlDNnRFYghHz00zqHuoMoZDLJdDnrKY1mkVoVWkUoCks2VcxUt5 s+7PFes2Iu3+AtK1nCnjsceT5GQRdIBPrcYnX/rl0ih+0L4j+vZVA6o56ZxIRgJ4on7171 XGZ5i5xP6wri4u5xCH8+u2N8KZdcn7w6wRzPx+aoprTxsR+ydYP68ToJp75fztMUxCebr8 DzqRiojxrUaNSg8gZaAuVSoYKC2rnmWOGDi12zhAZwELbUmOEGkazOcScJH5tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720903263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ad3wOtO6YNvgmzKxto5uv628UpOoc6FKZKFP+CHKgmA=; b=dU1LDOlTXH0IeqsxpvBULKxm71dFRzcIQhPU5XV/tlVc30QLa12LkyJi+OMSjga0ZchZml d0oyr529y+VzrFToBpFnFijGXNZ4x3yc1c9DBqVGjw/Zx8AfbpKbbPwU/fYurXCkitykhL SPQjyzFhM7UOUwqTMOow79VbThhFl/lLiUOXBWfvI3MQIcPNIyXIyQeJsCF4Um/oCCjZlr ZjH2EwM+3AisVGbW9HfGORBqp/Lohwv/DgzYe5FoKUYEnzFkxzBi0g24LokbhAc6hHiGrb llNVkGKZu+H0K8PT3pbDOIhzX7b3E6b0ZO4KT6JoLI3iS1us6eD0vUv8UaA2qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WM0jW2GpwzhJf; Sat, 13 Jul 2024 20:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46DKf3sS088423; Sat, 13 Jul 2024 20:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46DKf39v088420; Sat, 13 Jul 2024 20:41:03 GMT (envelope-from git) Date: Sat, 13 Jul 2024 20:41:03 GMT Message-Id: <202407132041.46DKf39v088420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b0391241ed62 - main - databases/rocksdb: Update to 9.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0391241ed62a6ef7c5441164d6b1cd3feb8b39a Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0391241ed62a6ef7c5441164d6b1cd3feb8b39a commit b0391241ed62a6ef7c5441164d6b1cd3feb8b39a Author: Po-Chuan Hsieh AuthorDate: 2024-07-13 20:17:34 +0000 Commit: Po-Chuan Hsieh 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 -+#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 @@ -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