git: c1532eb9d985 - main - databases/rocksdb: Update to 7.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 25 Mar 2022 13:42:39 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c1532eb9d9859638003de91da3cb97307a9d9663
commit c1532eb9d9859638003de91da3cb97307a9d9663
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-03-25 12:45:54 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-03-25 13:36:40 +0000
databases/rocksdb: Update to 7.0.1
Changes: https://github.com/facebook/rocksdb/releases
---
databases/rocksdb/Makefile | 8 ++++----
databases/rocksdb/distinfo | 6 +++---
databases/rocksdb/files/patch-Makefile | 8 +++++---
databases/rocksdb/pkg-plist | 8 ++------
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 21fa7dde4126..1a6c06ac22a5 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -1,7 +1,7 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= rocksdb
-PORTVERSION= 6.29.3
+PORTVERSION= 7.0.1
DISTVERSIONPREFIX= v
CATEGORIES= databases
@@ -22,7 +22,7 @@ BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libgflags.so:devel/gflags \
libsnappy.so:archivers/snappy
-USES= compiler:c++11-lib gmake localbase:ldflags perl5
+USES= compiler:c++17-lang gmake localbase:ldflags perl5
USE_PERL5= build
ALL_TARGET= shared_lib static_lib all
@@ -32,7 +32,7 @@ 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
-USE_CXXSTD= c++11
+USE_CXXSTD= c++17
USE_LDCONFIG= yes
TEST_TARGET= check
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 9b128387c2dc..51cea5b8e70a 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646057872
-SHA256 (facebook-rocksdb-v6.29.3_GH0.tar.gz) = 724e4cba2db6668ff6a21ecabcce0782cd0c8e386796e7e9a14a8260e0600abd
-SIZE (facebook-rocksdb-v6.29.3_GH0.tar.gz) = 9502512
+TIMESTAMP = 1647264422
+SHA256 (facebook-rocksdb-v7.0.1_GH0.tar.gz) = f1547be4dd76ca30d74e8d1377b893d36ecb7b526ffd835638ad34feb79be174
+SIZE (facebook-rocksdb-v7.0.1_GH0.tar.gz) = 9501192
diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile
index 347153273ec8..2c820e4c7ab6 100644
--- a/databases/rocksdb/files/patch-Makefile
+++ b/databases/rocksdb/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2021-06-25 21:15:04 UTC
+--- Makefile.orig 2022-03-10 06:51:01 UTC
+++ Makefile
-@@ -231,16 +231,16 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA
+@@ -220,17 +220,17 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA
# Detect what platform we're building on.
# Export some common variables that might have been passed as Make variables
# instead of environment variables.
@@ -13,6 +13,7 @@
- export PORTABLE="$(PORTABLE)"; \
- export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
- export USE_CLANG="$(USE_CLANG)"; \
+- export LIB_MODE="$(LIB_MODE)"; \
- "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
+#dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
+# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \
@@ -23,11 +24,12 @@
+# export PORTABLE="$(PORTABLE)"; \
+# export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
+# export USE_CLANG="$(USE_CLANG)"; \
++# export LIB_MODE="$(LIB_MODE)"; \
+# "$(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
-@@ -715,7 +715,7 @@ endif # PLATFORM_SHARED_EXT
+@@ -796,7 +796,7 @@ endif # PLATFORM_SHARED_EXT
blackbox_crash_test_with_ts whitebox_crash_test_with_ts
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index c95799a4ae94..4cb9faddb862 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -80,14 +80,12 @@ include/rocksdb/types.h
include/rocksdb/unique_id.h
include/rocksdb/universal_compaction.h
include/rocksdb/utilities/backup_engine.h
-include/rocksdb/utilities/backupable_db.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_librados.h
include/rocksdb/utilities/env_mirror.h
include/rocksdb/utilities/info_log_finder.h
include/rocksdb/utilities/ldb_cmd.h
@@ -101,7 +99,6 @@ 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/regex.h
include/rocksdb/utilities/replayer.h
include/rocksdb/utilities/sim_cache.h
include/rocksdb/utilities/stackable_db.h
@@ -109,7 +106,6 @@ 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/utility_db.h
include/rocksdb/utilities/write_batch_with_index.h
include/rocksdb/version.h
include/rocksdb/wal_filter.h
@@ -118,13 +114,13 @@ include/rocksdb/write_batch_base.h
include/rocksdb/write_buffer_manager.h
%%LITE%%lib/librocksdb-lite.a
%%LITE%%lib/librocksdb-lite.so
-%%LITE%%lib/librocksdb-lite.so.6
+%%LITE%%lib/librocksdb-lite.so.7
%%LITE%%lib/librocksdb-lite.so.%%SHLIB_VER%%
%%LITE%%lib/librocksdb-lite.so.%%PORTVERSION%%
%%LITE%%lib/librocksdb-lite_tools.so
%%NO_LITE%%lib/librocksdb.a
%%NO_LITE%%lib/librocksdb.so
-%%NO_LITE%%lib/librocksdb.so.6
+%%NO_LITE%%lib/librocksdb.so.7
%%NO_LITE%%lib/librocksdb.so.%%SHLIB_VER%%
%%NO_LITE%%lib/librocksdb.so.%%PORTVERSION%%
%%NO_LITE%%lib/librocksdb_tools.so