diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index fefdce2fbf..30512023f7 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb REF "v${VERSION}" - SHA512 8a64adce7cbb35449fb7f55dc92d1f902f317d9173f7afb02e6f047e42cc648f9f553364fbae14b14ed2fa3f125d32f49cccfb0c49f82f392508575396552c6e + SHA512 2f6fb50c5bb506665950520347104f666fcc29c7df5d806ccdf8c682f10043a0ea3c57b889871812951c5a5101ea8cf318b42b16383e5e6223e8c70e8a55e127 HEAD_REF main PATCHES 0002-only-build-one-flavor.patch @@ -35,7 +35,6 @@ vcpkg_cmake_configure( -DWITH_TESTS=OFF -DWITH_BENCHMARK_TOOLS=OFF -DWITH_TOOLS=OFF - -DWITH_FOLLY_DISTRIBUTED_MUTEX=OFF -DUSE_RTTI=1 -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF @@ -47,6 +46,11 @@ vcpkg_cmake_configure( -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 ) vcpkg_cmake_install() @@ -60,5 +64,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE.Apache" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/LICENSE.leveldb" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(COMMENT [[ +RocksDB is dual-licensed under both the GPLv2 (found in COPYING) +and Apache 2.0 License (found in LICENSE.Apache). You may select, +at your option, one of the above-listed licenses. +]] + FILE_LIST + "${SOURCE_PATH}/LICENSE.leveldb" + "${SOURCE_PATH}/LICENSE.Apache" + "${SOURCE_PATH}/COPYING" +) diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index 2c22a77beb..5da2f250f5 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rocksdb", - "version": "7.10.2", + "version": "8.0.0", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 3c258e4555..b7b3702dc5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6981,7 +6981,7 @@ "port-version": 0 }, "rocksdb": { - "baseline": "7.10.2", + "baseline": "8.0.0", "port-version": 0 }, "rpclib": { diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index 9e585550dc..dcbeb37ee3 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "284f182a8687ee7818ab84d5e7ada9bd5612cfcb", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "b09fc2a59392bb41e23e2eb0120eac2a77faca97", "version": "7.10.2",