diff --git a/ports/rocksdb/0004-fix-dependency-in-config.patch b/ports/rocksdb/0004-fix-dependency-in-config.patch index 7688b7763e0f95..59098ca22e63c0 100644 --- a/ports/rocksdb/0004-fix-dependency-in-config.patch +++ b/ports/rocksdb/0004-fix-dependency-in-config.patch @@ -1,8 +1,13 @@ diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in -index 0bd14be11..f9f6aa878 100644 +index 0bd14be11..ad07f018a 100644 --- a/cmake/RocksDBConfig.cmake.in +++ b/cmake/RocksDBConfig.cmake.in -@@ -37,7 +37,7 @@ if(@WITH_LZ4@) +@@ -33,11 +33,11 @@ if(@WITH_BZ2@) + endif() + + if(@WITH_LZ4@) +- find_dependency(lz4) ++ find_dependency(lz4 CONFIG) endif() if(@WITH_ZSTD@) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 30512023f740e6..b76979c7b5957d 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb REF "v${VERSION}" - SHA512 2f6fb50c5bb506665950520347104f666fcc29c7df5d806ccdf8c682f10043a0ea3c57b889871812951c5a5101ea8cf318b42b16383e5e6223e8c70e8a55e127 + SHA512 6640deb2aeef493a36125a081c0a1f5fa0e15636ad824088d26c03bacee95af742d833bb7e601952aa0d278563025934049a8195ab14c1cd18e29636fe5f64d7 HEAD_REF main PATCHES 0002-only-build-one-flavor.patch @@ -18,14 +16,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_BUILD_SHARED) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "lz4" WITH_LZ4 - "snappy" WITH_SNAPPY - "zlib" WITH_ZLIB - "zstd" WITH_ZSTD - "bzip2" WITH_BZ2 - "tbb" WITH_TBB - INVERTED_FEATURES - "tbb" CMAKE_DISABLE_FIND_PACKAGE_TBB + "liburing" WITH_LIBURING + "snappy" WITH_SNAPPY + "lz4" WITH_LZ4 + "zlib" WITH_ZLIB + "zstd" WITH_ZSTD + "bzip2" WITH_BZ2 + "numa" WITH_NUMA + "tbb" WITH_TBB ) vcpkg_cmake_configure( @@ -35,22 +33,19 @@ vcpkg_cmake_configure( -DWITH_TESTS=OFF -DWITH_BENCHMARK_TOOLS=OFF -DWITH_TOOLS=OFF - -DUSE_RTTI=1 + -DUSE_RTTI=ON -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} - -DPORTABLE=ON - -DCMAKE_DEBUG_POSTFIX=d + -DPORTABLE=1 # Minimum CPU arch to support, or 0 = current CPU, 1 = baseline CPU -DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED} - -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_NUMA - CMAKE_DISABLE_FIND_PACKAGE_gtest - CMAKE_DISABLE_FIND_PACKAGE_TBB - CMAKE_DEBUG_POSTFIX + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d + -DWITH_RUNTIME_DEBUG=ON + OPTIONS_RELEASE + -DWITH_RUNTIME_DEBUG=OFF ) vcpkg_cmake_install() diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index 5da2f250f5e0e5..bb712a55953a02 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rocksdb", - "version": "8.0.0", + "version": "8.3.2", "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", + "supports": "!uwp & !(arm & !arm64 & android)", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,41 +16,55 @@ } ], "default-features": [ + "liburing", "zlib" ], "features": { "bzip2": { - "description": "bzip2 support in rocksdb", + "description": "build with bzip2", "dependencies": [ "bzip2" ] }, + "liburing": { + "description": "build with liburing", + "dependencies": [ + { + "name": "liburing", + "platform": "linux" + } + ] + }, "lz4": { - "description": "lz4 support in rocksdb", + "description": "build with lz4", "dependencies": [ "lz4" ] }, + "numa": { + "description": "build with NUMA policy support", + "supports": "linux" + }, "snappy": { - "description": "snappy support in rocksdb", + "description": "build with SNAPPY", "dependencies": [ "snappy" ] }, "tbb": { - "description": "tbb support in rocksdb", + "description": "build with Threading Building Blocks (TBB)", "dependencies": [ "tbb" ] }, "zlib": { - "description": "zlib support in rocksdb", + "description": "build with zlib", "dependencies": [ "zlib" ] }, "zstd": { - "description": "zstd support in rocksdb", + "description": "build with zstd", "dependencies": [ "zstd" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 83966c17d3eb71..181477e95957ed 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1311,9 +1311,6 @@ rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip rhash:arm64-windows=fail -rocksdb:arm-neon-android=fail -rocksdb:arm-uwp=fail -rocksdb:x64-uwp=fail rpclib:arm64-windows=fail rpclib:arm-uwp=fail rpclib:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index fc17e71afe18cc..97cdb5c8f701a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7205,7 +7205,7 @@ "port-version": 0 }, "rocksdb": { - "baseline": "8.0.0", + "baseline": "8.3.2", "port-version": 0 }, "rpclib": { diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index dcbeb37ee3f59d..be4b0c2a63e860 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d5c9033fedfbf0a9e993125f5511616b894f493", + "version": "8.3.2", + "port-version": 0 + }, { "git-tree": "284f182a8687ee7818ab84d5e7ada9bd5612cfcb", "version": "8.0.0",