From 7fb3f62703f3f5d1cb672708ff9c7556abe9bbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Budiseli=C4=87?= Date: Thu, 15 Jun 2023 11:54:24 +0200 Subject: [PATCH] Upgrade to RocksDB 8.1.1 (#1013) --- libs/.gitignore | 1 + libs/rocksdb8.1.1.patch | 13 +++++++++++++ libs/setup.sh | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 libs/rocksdb8.1.1.patch diff --git a/libs/.gitignore b/libs/.gitignore index f4ebfc3a0..1d149f2f0 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -6,3 +6,4 @@ !__main.cpp !pulsar.patch !antlr4.10.1.patch +!rocksdb8.1.1.patch diff --git a/libs/rocksdb8.1.1.patch b/libs/rocksdb8.1.1.patch new file mode 100644 index 000000000..d3ed84d60 --- /dev/null +++ b/libs/rocksdb8.1.1.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 598c728..816c705 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1242,7 +1242,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + + if(ROCKSDB_BUILD_SHARED) + install( +- TARGETS ${ROCKSDB_SHARED_LIB} ++ TARGETS ${ROCKSDB_SHARED_LIB} OPTIONAL + EXPORT RocksDBTargets + COMPONENT runtime + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/libs/setup.sh b/libs/setup.sh index fda10c24a..42967bca9 100755 --- a/libs/setup.sh +++ b/libs/setup.sh @@ -192,10 +192,10 @@ cd json file_get_try_double "${primary_urls[nlohmann]}" "${secondary_urls[nlohmann]}" cd .. -rocksdb_tag="v6.14.6" # (2020-10-14) +rocksdb_tag="v8.1.1" # (2023-04-21) repo_clone_try_double "${primary_urls[rocksdb]}" "${secondary_urls[rocksdb]}" "rocksdb" "$rocksdb_tag" true pushd rocksdb -git apply ../rocksdb.patch +git apply ../rocksdb8.1.1.patch popd # mgclient