From ba4d14150804aab43acf66e33a23c5ff0356005b Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Tue, 15 Feb 2022 23:30:03 -0800 Subject: [PATCH 1/6] [leveldb] Fix target "Threads::Threads" was not found --- ports/leveldb/leveldbConfig.cmake.in | 5 +++-- ports/leveldb/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/leveldb/leveldbConfig.cmake.in b/ports/leveldb/leveldbConfig.cmake.in index 5eecb83169de04..65b9bac51cdb83 100644 --- a/ports/leveldb/leveldbConfig.cmake.in +++ b/ports/leveldb/leveldbConfig.cmake.in @@ -2,12 +2,13 @@ include(CMakeFindDependencyMacro) set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +find_dependency(Threads) if (@WITH_CRC32C@) - find_depedency(Crc32c CONFIG) + find_dependency(Crc32c CONFIG) endif() if (@WITH_SNAPPY@) - find_depedency(Snappy CONFIG) + find_dependency(Snappy CONFIG) endif() include("${CMAKE_CURRENT_LIST_DIR}/leveldbTargets.cmake") diff --git a/ports/leveldb/vcpkg.json b/ports/leveldb/vcpkg.json index 38549aa32fff6a..1a31102e180062 100644 --- a/ports/leveldb/vcpkg.json +++ b/ports/leveldb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "leveldb", "version-string": "1.22", - "port-version": 3, + "port-version": 4, "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/bitcoin-core/leveldb", "license": "BSD-3-Clause", From 581b229cce9b5d59dcdb566d84e391a702353912 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Tue, 15 Feb 2022 23:31:34 -0800 Subject: [PATCH 2/6] update version --- versions/baseline.json | 2 +- versions/l-/leveldb.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 64bd50ebc112bb..252d638e37e682 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3314,7 +3314,7 @@ }, "leveldb": { "baseline": "1.22", - "port-version": 3 + "port-version": 4 }, "levmar": { "baseline": "2.6", diff --git a/versions/l-/leveldb.json b/versions/l-/leveldb.json index b5ebbf73420347..6ea6fea01b7b3d 100644 --- a/versions/l-/leveldb.json +++ b/versions/l-/leveldb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c41d96d2e0f6f6301e2370bc00fa7390cdd94330", + "version-string": "1.22", + "port-version": 4 + }, { "git-tree": "55e42f74e1f541143900887a64661c8c8e4ea713", "version-string": "1.22", From 019ca3f25c27f853219e222cc8f325531d3df56e Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Tue, 15 Feb 2022 23:45:22 -0800 Subject: [PATCH 3/6] add dependency pthreads --- ports/leveldb/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/leveldb/vcpkg.json b/ports/leveldb/vcpkg.json index 1a31102e180062..8af6031dfa483f 100644 --- a/ports/leveldb/vcpkg.json +++ b/ports/leveldb/vcpkg.json @@ -7,6 +7,7 @@ "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ + "pthreads", { "name": "vcpkg-cmake", "host": true From 87d8c57995b36c374ae0ad6f1c22bb3f7be930e2 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Tue, 15 Feb 2022 23:45:41 -0800 Subject: [PATCH 4/6] update version --- versions/l-/leveldb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/leveldb.json b/versions/l-/leveldb.json index 6ea6fea01b7b3d..812c857d8e5db2 100644 --- a/versions/l-/leveldb.json +++ b/versions/l-/leveldb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c41d96d2e0f6f6301e2370bc00fa7390cdd94330", + "git-tree": "9e30edfe3a59592d34a5d3d20906e406b94a8edd", "version-string": "1.22", "port-version": 4 }, From 1eae254e3e782342b422aefdb87310779800b23b Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Fri, 18 Feb 2022 01:30:38 -0800 Subject: [PATCH 5/6] remove pthreads --- ports/leveldb/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/leveldb/vcpkg.json b/ports/leveldb/vcpkg.json index 8af6031dfa483f..1a31102e180062 100644 --- a/ports/leveldb/vcpkg.json +++ b/ports/leveldb/vcpkg.json @@ -7,7 +7,6 @@ "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ - "pthreads", { "name": "vcpkg-cmake", "host": true From 6e83952bc14e07800ae7cf111534e9449c35c9db Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Fri, 18 Feb 2022 01:31:22 -0800 Subject: [PATCH 6/6] update version --- versions/l-/leveldb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/leveldb.json b/versions/l-/leveldb.json index 812c857d8e5db2..6ea6fea01b7b3d 100644 --- a/versions/l-/leveldb.json +++ b/versions/l-/leveldb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9e30edfe3a59592d34a5d3d20906e406b94a8edd", + "git-tree": "c41d96d2e0f6f6301e2370bc00fa7390cdd94330", "version-string": "1.22", "port-version": 4 },