[leveldb] Update to 2026-03-11 (#53608)

This commit is contained in:
xiaozhuai 2026-08-28 09:35:45 +08:00 committed by GitHub
parent 113d687a8d
commit 0319a9de46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 62 additions and 46 deletions

View File

@ -1,13 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8285b8..39536fc 100644
index ce8f587..c620ace 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,14 @@ include(CheckIncludeFile)
@@ -37,11 +37,19 @@ option(LEVELDB_INSTALL "Install LevelDB's header and library" ON)
include(CheckIncludeFile)
check_include_file("unistd.h" HAVE_UNISTD_H)
include(CheckLibraryExists)
-include(CheckLibraryExists)
-check_library_exists(crc32c crc32c_value "" HAVE_CRC32C)
-check_library_exists(snappy snappy_compress "" HAVE_SNAPPY)
-check_library_exists(zstd zstd_compress "" HAVE_ZSTD)
-check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC)
+if (WITH_CRC32C)
+ find_package(Crc32c CONFIG REQUIRED)
+ set(HAVE_CRC32C 1)
@ -16,10 +19,15 @@ index f8285b8..39536fc 100644
+ find_package(Snappy CONFIG REQUIRED)
+ set(HAVE_SNAPPY 1)
+endif()
check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC)
+if (WITH_ZSTD)
+ find_package(zstd CONFIG REQUIRED)
+ set(HAVE_ZSTD 1)
+endif()
+set(HAVE_TCMALLOC 0)
include(CheckCXXSymbolExists)
@@ -268,10 +274,10 @@ if(HAVE_CLANG_THREAD_SAFETY)
# Using check_cxx_symbol_exists() instead of check_c_symbol_exists() because
@@ -269,13 +277,13 @@ if(HAVE_CLANG_THREAD_SAFETY)
endif(HAVE_CLANG_THREAD_SAFETY)
if(HAVE_CRC32C)
@ -30,5 +38,34 @@ index f8285b8..39536fc 100644
- target_link_libraries(leveldb snappy)
+ target_link_libraries(leveldb Snappy::snappy)
endif(HAVE_SNAPPY)
if(HAVE_ZSTD)
- target_link_libraries(leveldb zstd)
+ target_link_libraries(leveldb zstd::libzstd)
endif(HAVE_ZSTD)
if(HAVE_TCMALLOC)
target_link_libraries(leveldb tcmalloc)
diff --git a/cmake/leveldbConfig.cmake.in b/cmake/leveldbConfig.cmake.in
index 2572728..710f780 100644
--- a/cmake/leveldbConfig.cmake.in
+++ b/cmake/leveldbConfig.cmake.in
@@ -4,6 +4,19 @@
@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+
+find_dependency(Threads)
+if (@WITH_CRC32C@)
+ find_dependency(Crc32c CONFIG)
+endif()
+if (@WITH_SNAPPY@)
+ find_dependency(Snappy CONFIG)
+endif()
+if (@WITH_ZSTD@)
+ find_dependency(zstd CONFIG)
+endif()
+
include("${CMAKE_CURRENT_LIST_DIR}/leveldbTargets.cmake")
check_required_components(leveldb)
\ No newline at end of file

View File

@ -1,16 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39536fc..648de6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,6 +477,11 @@ if(LEVELDB_INSTALL)
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/leveldb"
)
+ file(GLOB HEADER_UTIL "${PROJECT_SOURCE_DIR}/util/*.h" )
+ file(GLOB HEADER_TABLE "${PROJECT_SOURCE_DIR}/table/*.h" )
+ install(FILES ${HEADER_UTIL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/util)
+ install(FILES ${HEADER_TABLE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/table)
+
include(CMakePackageConfigHelpers)
configure_package_config_file(
"cmake/${PROJECT_NAME}Config.cmake.in"

View File

@ -1,13 +0,0 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(Threads)
if (@WITH_CRC32C@)
find_dependency(Crc32c CONFIG)
endif()
if (@WITH_SNAPPY@)
find_dependency(Snappy CONFIG)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/leveldbTargets.cmake")

View File

@ -5,20 +5,18 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/leveldb
REF "${VERSION}"
SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
HEAD_REF master
REF 7ee830d02b623e8ffe0b95d59a74db1e58da04c5 # 2026-03-11
SHA512 1e478f31835710fb5532492fd7cc72e292d096baa756e27d0a8b0cb6366f021374a44fe3d922e631badff52ce1908ea1fc449098f945cf956d107d8fa64f5cae
HEAD_REF main
PATCHES
fix-dependencies.patch
fix-util-install.patch
)
file(COPY "${CURRENT_PORT_DIR}/leveldbConfig.cmake.in" DESTINATION "${SOURCE_PATH}/cmake")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
crc32c WITH_CRC32C
snappy WITH_SNAPPY
zstd WITH_ZSTD
)
vcpkg_cmake_configure(
@ -27,7 +25,6 @@ vcpkg_cmake_configure(
${FEATURE_OPTIONS}
-DLEVELDB_BUILD_TESTS=OFF
-DLEVELDB_BUILD_BENCHMARKS=OFF
-DHAVE_TCMALLOC=OFF
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/leveldb")

View File

@ -1,7 +1,6 @@
{
"name": "leveldb",
"version": "1.23",
"port-version": 1,
"version-date": "2026-03-11",
"description": "LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.",
"homepage": "https://github.com/google/leveldb",
"license": "BSD-3-Clause",
@ -28,6 +27,12 @@
"dependencies": [
"snappy"
]
},
"zstd": {
"description": "Build with zstd",
"dependencies": [
"zstd"
]
}
}
}

View File

@ -7,7 +7,8 @@
"name": "leveldb",
"features": [
"crc32c",
"snappy"
"snappy",
"zstd"
]
},
{

View File

@ -4729,8 +4729,8 @@
"port-version": 0
},
"leveldb": {
"baseline": "1.23",
"port-version": 1
"baseline": "2026-03-11",
"port-version": 0
},
"levmar": {
"baseline": "2.6",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0306113b6298d30bb0ae611c75617890f62ab67a",
"version-date": "2026-03-11",
"port-version": 0
},
{
"git-tree": "06c248e18c2726f267a52d1e8c3b97acafc801b0",
"version": "1.23",