[leveldb] update to 1.23 (#34179)

This commit is contained in:
Jia Yue Hua 2023-10-03 08:37:58 +08:00 committed by GitHub
parent 4c3d49c6c1
commit 3e1ca9d1f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 53 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b87dc..76d2e9b 100644
index f8285b8..39536fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,14 @@ include(CheckIncludeFile)
@@ -38,8 +38,14 @@ include(CheckIncludeFile)
check_include_file("unistd.h" HAVE_UNISTD_H)
include(CheckLibraryExists)
@ -19,7 +19,7 @@ index 98b87dc..76d2e9b 100644
check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC)
include(CheckCXXSymbolExists)
@@ -246,10 +252,10 @@ if(HAVE_CLANG_THREAD_SAFETY)
@@ -268,10 +274,10 @@ if(HAVE_CLANG_THREAD_SAFETY)
endif(HAVE_CLANG_THREAD_SAFETY)
if(HAVE_CRC32C)

View File

@ -1,16 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d2e9b..f29b043 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -438,6 +438,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)
write_basic_package_version_file(
"${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake"
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,26 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1409c06..98b87dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -437,6 +437,12 @@ if(LEVELDB_INSTALL)
"${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake"
COMPATIBILITY SameMajorVersion
)
+ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake.in
+ leveldbConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/leveldb
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR
+ )
install(
EXPORT leveldbTargets
NAMESPACE leveldb::
@@ -444,7 +450,7 @@ if(LEVELDB_INSTALL)
)
install(
FILES
- "${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake"
+ "${PROJECT_BINARY_DIR}/leveldbConfig.cmake"
"${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb"
)

View File

@ -1,7 +1,6 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
find_dependency(Threads)
if (@WITH_CRC32C@)

View File

@ -3,11 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/leveldb
REF 1.22
SHA512 f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab
REF "${VERSION}"
SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
HEAD_REF master
PATCHES
fix_config.patch
fix-dependencies.patch
fix-util-install.patch
)

View File

@ -1,7 +1,6 @@
{
"name": "leveldb",
"version": "1.22",
"port-version": 7,
"version": "1.23",
"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",

View File

@ -3909,8 +3909,8 @@
"port-version": 3
},
"leveldb": {
"baseline": "1.22",
"port-version": 7
"baseline": "1.23",
"port-version": 0
},
"levmar": {
"baseline": "2.6",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "893680e6d71d61d7bcf7c132c8a2263c0fa4c72a",
"version": "1.23",
"port-version": 0
},
{
"git-tree": "9eff4d1f18a28c13709e987d759a116a36a6a14a",
"version": "1.22",