diff --git a/ports/rocksdb/0002-only-build-one-flavor.patch b/ports/rocksdb/0002-only-build-one-flavor.patch index 2d6b3aa07ff1ba..00e46377dc3dfb 100644 --- a/ports/rocksdb/0002-only-build-one-flavor.patch +++ b/ports/rocksdb/0002-only-build-one-flavor.patch @@ -1,36 +1,53 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ab8954b6..5b0405f4a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -793,6 +793,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - - install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -+ if(NOT ROCKSDB_DISABLE_INSTALL_STATIC_LIB) - install( - TARGETS ${ROCKSDB_STATIC_LIB} - EXPORT RocksDBTargets -@@ -800,15 +801,23 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" - ) -+ else() -+ set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) -+ endif() - -+ if(NOT ROCKSDB_DISABLE_INSTALL_SHARED_LIB) - install( - TARGETS ${ROCKSDB_SHARED_LIB} - EXPORT RocksDBTargets - COMPONENT runtime - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" - ) -+ else() -+ set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) -+ endif() - - install( - EXPORT RocksDBTargets +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ff370fb..6916fcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -810,24 +810,30 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + ) + + install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +- +- install( +- TARGETS ${ROCKSDB_STATIC_LIB} +- EXPORT RocksDBTargets +- COMPONENT devel +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- ) +- +- install( +- TARGETS ${ROCKSDB_SHARED_LIB} +- EXPORT RocksDBTargets +- COMPONENT runtime +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- ) ++ if(NOT ROCKSDB_DISABLE_INSTALL_STATIC_LIB) ++ 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(NOT ROCKSDB_DISABLE_INSTALL_SHARED_LIB) ++ install( ++ TARGETS ${ROCKSDB_SHARED_LIB} ++ EXPORT RocksDBTargets ++ COMPONENT runtime ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ ) ++ else() ++ set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) ++ endif() + + install( + EXPORT RocksDBTargets diff --git a/ports/rocksdb/0003-zlib-findpackage.patch b/ports/rocksdb/0003-zlib-findpackage.patch index c2d71dc00673a2..e66f8f17fe1a9c 100644 --- a/ports/rocksdb/0003-zlib-findpackage.patch +++ b/ports/rocksdb/0003-zlib-findpackage.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b0405f4a..43256fc04 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,7 +88,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - include_directories(${ZLIB_INCLUDE_DIR}) - list(APPEND THIRDPARTY_LIBS ${ZLIB_LIBRARIES}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6916fcd..a52c53f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,7 +92,7 @@ else() + endif() + + if(WITH_ZLIB) +- find_package(zlib REQUIRED) ++ find_package(ZLIB REQUIRED) + add_definitions(-DZLIB) + if(ZLIB_INCLUDE_DIRS) + # CMake 3 diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 08235d89d30812..6588f527cda7e4 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.18.3-1 +Version: 6.0.1 Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 22698dc1a8de67..b5356c31e91201 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v5.18.3 - SHA512 5f8c9e66dd7d7f1071dbbdd0442519df403f92876f9ed120b6a89788446cabf86275866a8ea273ab6fcb9d62cc7f3dc4d5b1684aa39c3956eea47b5b93938d54 + REF v6.0.1 + SHA512 ce44baa407ea692b1e4c6ca76578d14f7f15df81e7687f17d6ac19e1f9bcb81fa1d0cc921fe0b137f960d95c85aba219c2a981365635531206d0cf1cf1cfe473 HEAD_REF master PATCHES 0001-disable-gtest.patch