From 9c5dcd6afec0a1e0f7d5191aafd0e46ac10a1ee5 Mon Sep 17 00:00:00 2001 From: jmanjon <67091862+juandemanjon@users.noreply.github.com> Date: Mon, 11 Apr 2022 08:50:10 -0700 Subject: [PATCH] [LMDB] update to 0.9.29 (#24045) * #24044 LMDB update to 0.9.29 * #24044 LMDB update to 0.9.29 * #24044 LMDB update to 0.9.29 * Modernize port file.cmake * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/lmdb/portfile.cmake | 18 +++++++++--------- ports/lmdb/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/l-/lmdb.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index 632d7a59e7..263966bbd3 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -1,23 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb - REF 0c357cc88a00bda03aa4a982fc227a5872707df2 # LMDB_0.9.24 - SHA512 a4d4ff96078eaf608eff08014d56561903f113a32617d3c9327dcdedfb7b261e03a80bf705f9d7159bb065eb1ab3c95af49d42525b75de0c2953223377042dec + REF 8ad7be2510414b9506ec9f9e24f24d04d9b04a1a # LMDB_0.9.29 + SHA512 a18b6217761bdfcc5964d9817addd2d0c6c735d02a823717eb7ae1561a48110da0708a3290e21297d481e4d8eeb5d92a4a6860ff44888bf2da665cd9f167513c HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}/libraries/liblmdb) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/libraries/liblmdb - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libraries/liblmdb" OPTIONS_DEBUG -DLMDB_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lmdb RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lmdb" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 2c2b59092b..1a15ee7a4f 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,8 +1,17 @@ { "name": "lmdb", - "version": "0.9.24", - "port-version": 2, + "version": "0.9.29", "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", - "license": null + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 342dda289b..b6cccc1772 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4249,8 +4249,8 @@ "port-version": 3 }, "lmdb": { - "baseline": "0.9.24", - "port-version": 2 + "baseline": "0.9.29", + "port-version": 0 }, "lodepng": { "baseline": "2021-12-04", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index 5166dd8f1e..027244f68e 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "980e2c4a26c75996e3940a9b46032356643e592b", + "version": "0.9.29", + "port-version": 0 + }, { "git-tree": "022fa44ff8c5ef9ea4b308468259c0775d4a72c1", "version": "0.9.24",