mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[rocksdb] update to v8.5.3 (#33535)

Browse Source
This commit is contained in:
Yury Bura 2023-09-06 07:33:57 +02:00 committed by GitHub
parent 6bee51db43
commit 8dfa578f33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 133 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
ports/rocksdb/0001-fix-dependencies.patch Normal file
View File

@ -0,0 +1,123 @@
CMakeLists.txt | 33 +++++++++++++++------------------
cmake/RocksDBConfig.cmake.in | 11 ++++++++---
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e30f6631..b428c811b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ endif()
include(CMakeDependentOption)
-if(MSVC)
+if(0)
option(WITH_GFLAGS "build with GFlags" OFF)
option(WITH_XPRESS "build with windows built in compression" OFF)
option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF)
@@ -136,10 +136,7 @@ else()
endif()
if(WITH_SNAPPY)
- find_package(Snappy CONFIG)
- if(NOT Snappy_FOUND)
- find_package(Snappy REQUIRED)
- endif()
+ find_package(Snappy CONFIG REQUIRED)
add_definitions(-DSNAPPY)
list(APPEND THIRDPARTY_LIBS Snappy::snappy)
endif()
@@ -163,16 +160,19 @@ else()
endif()
if(WITH_LZ4)
- find_package(lz4 REQUIRED)
+ find_package(lz4 CONFIG REQUIRED)
add_definitions(-DLZ4)
list(APPEND THIRDPARTY_LIBS lz4::lz4)
endif()
if(WITH_ZSTD)
- find_package(zstd REQUIRED)
+ find_package(zstd CONFIG REQUIRED)
add_definitions(-DZSTD)
- include_directories(${ZSTD_INCLUDE_DIR})
- list(APPEND THIRDPARTY_LIBS zstd::zstd)
+ if(TARGET zstd::libzstd_shared)
+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared)
+ elseif(TARGET zstd::libzstd_static)
+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static)
+ endif()
endif()
endif()
@@ -312,11 +312,10 @@ int main() {
endif()
if (WITH_LIBURING)
- find_package(uring)
- if (uring_FOUND)
- add_definitions(-DROCKSDB_IOURING_PRESENT)
- list(APPEND THIRDPARTY_LIBS uring::uring)
- endif()
+ find_package(PkgConfig)
+ pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0)
+ add_definitions(-DROCKSDB_IOURING_PRESENT)
+ list(APPEND THIRDPARTY_LIBS PkgConfig::liburing)
endif()
# Reset the required flags
@@ -382,9 +381,9 @@ endif()
option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF)
if(WITH_TBB)
- find_package(TBB REQUIRED)
+ find_package(TBB CONFIG REQUIRED)
add_definitions(-DTBB)
- list(APPEND THIRDPARTY_LIBS TBB::TBB)
+ list(APPEND THIRDPARTY_LIBS TBB::tbb)
endif()
# Stall notifications eat some performance from inserts
@@ -1195,8 +1194,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
endforeach()
endforeach()
- install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
-
install(
TARGETS ${ROCKSDB_STATIC_LIB}
EXPORT RocksDBTargets
diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in
index 0bd14be11..a420d8bfe 100644
--- a/cmake/RocksDBConfig.cmake.in
+++ b/cmake/RocksDBConfig.cmake.in
@@ -33,11 +33,11 @@ if(@WITH_BZ2@)
endif()
if(@WITH_LZ4@)
- find_dependency(lz4)
+ find_dependency(lz4 CONFIG)
endif()
if(@WITH_ZSTD@)
- find_dependency(zstd)
+ find_dependency(zstd CONFIG)
endif()
if(@WITH_NUMA@)
@@ -45,7 +45,12 @@ if(@WITH_NUMA@)
endif()
if(@WITH_TBB@)
- find_dependency(TBB)
+ find_dependency(TBB CONFIG)
+endif()
+
+if(@WITH_LIBURING@)
+ find_dependency(PkgConfig)
+ pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0)
endif()
find_dependency(Threads)

29
ports/rocksdb/0002-only-build-one-flavor.patch
View File

@ -1,29 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a6411653..526dfcf60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1077,13 +1077,17 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
- install(
- TARGETS ${ROCKSDB_STATIC_LIB}
- EXPORT RocksDBTargets
- COMPONENT devel
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
- )
+ if(NOT ROCKSDB_BUILD_SHARED)
+ install(
+ TARGETS ${ROCKSDB_STATIC_LIB}
+ EXPORT RocksDBTargets
+ COMPONENT devel
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ else()
+ set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ endif()
if(ROCKSDB_BUILD_SHARED)
install(

61
ports/rocksdb/0003-use-find-package.patch
View File

@ -1,61 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b4f47a..3d90152 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ endif()
include(CMakeDependentOption)
-if(MSVC)
+if(MSVC AND NOT VCPKG_TOOLCHAIN)
option(WITH_GFLAGS "build with GFlags" OFF)
option(WITH_XPRESS "build with windows built in compression" OFF)
option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF)
@@ -136,10 +136,7 @@ else()
endif()
if(WITH_SNAPPY)
- find_package(Snappy CONFIG)
- if(NOT Snappy_FOUND)
- find_package(Snappy REQUIRED)
- endif()
+ find_package(Snappy CONFIG REQUIRED)
add_definitions(-DSNAPPY)
list(APPEND THIRDPARTY_LIBS Snappy::snappy)
endif()
@@ -163,16 +160,19 @@ else()
endif()
if(WITH_LZ4)
- find_package(lz4 REQUIRED)
+ find_package(lz4 CONFIG REQUIRED)
add_definitions(-DLZ4)
list(APPEND THIRDPARTY_LIBS lz4::lz4)
endif()
if(WITH_ZSTD)
- find_package(zstd REQUIRED)
+ find_package(zstd CONFIG REQUIRED)
add_definitions(-DZSTD)
- include_directories(${ZSTD_INCLUDE_DIR})
- list(APPEND THIRDPARTY_LIBS zstd::zstd)
+ if(TARGET zstd::libzstd_shared)
+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared)
+ elseif(TARGET zstd::libzstd_static)
+ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static)
+ endif()
endif()
endif()
@@ -402,9 +402,9 @@ endif()
option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF)
if(WITH_TBB)
- find_package(TBB REQUIRED)
+ find_package(TBB CONFIG REQUIRED)
add_definitions(-DTBB)
- list(APPEND THIRDPARTY_LIBS TBB::TBB)
+ list(APPEND THIRDPARTY_LIBS TBB::tbb)
endif()
# Stall notifications eat some performance from inserts

27
ports/rocksdb/0004-fix-dependency-in-config.patch
View File

@ -1,27 +0,0 @@
diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in
index 0bd14be11..ad07f018a 100644
--- a/cmake/RocksDBConfig.cmake.in
+++ b/cmake/RocksDBConfig.cmake.in
@@ -33,11 +33,11 @@ if(@WITH_BZ2@)
endif()
if(@WITH_LZ4@)
- find_dependency(lz4)
+ find_dependency(lz4 CONFIG)
endif()
if(@WITH_ZSTD@)
- find_dependency(zstd)
+ find_dependency(zstd CONFIG)
endif()
if(@WITH_NUMA@)
@@ -45,7 +45,7 @@ if(@WITH_NUMA@)
endif()
if(@WITH_TBB@)
- find_dependency(TBB)
+ find_dependency(TBB CONFIG)
endif()
find_dependency(Threads)

13
ports/rocksdb/0005-do-not-install-cmake-modules.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d90152..b0c5d31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1206,7 +1206,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
endforeach()
endforeach()
- install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
+ #install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
if(NOT ROCKSDB_BUILD_SHARED)
install(

7
ports/rocksdb/portfile.cmake
View File

@ -2,13 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/rocksdb
REF "v${VERSION}"
SHA512 6640deb2aeef493a36125a081c0a1f5fa0e15636ad824088d26c03bacee95af742d833bb7e601952aa0d278563025934049a8195ab14c1cd18e29636fe5f64d7
SHA512 2039a4afa9e6ee7d01aba3287f27f43cb48baf55be98b5be06f0b54982f7e28c1032ec1dbd1f10d946554c3c93a93686e7b51aab0d92f731ad4dd7d7c62bed74
HEAD_REF main
PATCHES
0002-only-build-one-flavor.patch
0003-use-find-package.patch
0004-fix-dependency-in-config.patch
0005-do-not-install-cmake-modules.patch
0001-fix-dependencies.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY)

4
ports/rocksdb/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "rocksdb",
"version": "8.3.2",
"version": "8.5.3",
"description": "A library that provides an embeddable, persistent key-value store for fast storage",
"homepage": "https://github.com/facebook/rocksdb",
"license": "GPL-2.0-only OR Apache-2.0",
@ -16,7 +16,6 @@
}
],
"default-features": [
"liburing",
"zlib"
],
"features": {
@ -28,6 +27,7 @@
},
"liburing": {
"description": "build with liburing",
"supports": "linux",
"dependencies": [
{
"name": "liburing",

2
versions/baseline.json
View File

@ -7281,7 +7281,7 @@
"port-version": 0
},
"rocksdb": {
"baseline": "8.3.2",
"baseline": "8.5.3",
"port-version": 0
},
"rpclib": {

5
versions/r-/rocksdb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "caf00463e9aa52209110783d90fa39066eaa4249",
"version": "8.5.3",
"port-version": 0
},
{
"git-tree": "3d5c9033fedfbf0a9e993125f5511616b894f493",
"version": "8.3.2",