From 1eb49ea2ecba44278cdcba55f60690b90c4af242 Mon Sep 17 00:00:00 2001 From: Radames Cruz Date: Fri, 12 Feb 2021 19:10:44 -0800 Subject: [kuku] Update Kuku to version 2.1 (#16194) * Update Kuku to version 2.1 * Update Kuku version in version files --- ports/kuku/CMakeLists-windows.patch | 15 --------------- ports/kuku/CONTROL | 2 +- ports/kuku/portfile.cmake | 7 +++---- versions/baseline.json | 2 +- versions/k-/kuku.json | 5 +++++ 5 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 ports/kuku/CMakeLists-windows.patch diff --git a/ports/kuku/CMakeLists-windows.patch b/ports/kuku/CMakeLists-windows.patch deleted file mode 100644 index 88ce013e2..000000000 --- a/ports/kuku/CMakeLists-windows.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4a87db..10d3eb2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,10 +13,6 @@ cmake_minimum_required(VERSION 3.12) - - project(Kuku VERSION 2.0.0 LANGUAGES CXX C) - --if(${MSVC}) -- message(FATAL_ERROR "Please build using the attached Visual Studio solution/project files.") --endif() -- - ######################## - # Global configuration # - ######################## diff --git a/ports/kuku/CONTROL b/ports/kuku/CONTROL index 2e377be56..27766063a 100644 --- a/ports/kuku/CONTROL +++ b/ports/kuku/CONTROL @@ -1,4 +1,4 @@ Source: kuku -Version: 2.0 +Version: 2.1 Homepage: https://github.com/microsoft/Kuku Description: Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft. diff --git a/ports/kuku/portfile.cmake b/ports/kuku/portfile.cmake index 975dda6d8..98ff18775 100644 --- a/ports/kuku/portfile.cmake +++ b/ports/kuku/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/Kuku - REF e7cd2d6ad7f8886061c8e4b85890ede69cec3929 - SHA512 8220a8e839bd247d6a8d1049562028c620353d0cabee0681383d1457bda544ff1394709eeaa82a92a8c0d3491cc9f15de1a14b78a86e8f97ee1da68eb50c982e + REF 1338c4ae2211ab4c739022ff57f48ce5a76531d5 + SHA512 6cba13b7fc8c453acbfcb4921ee3acc9c3e91d4bba0e01480ea396e17f85288d0179342090111a2e3c056b6918c7b09ec63c41116eb4021e63c54acc19631156 HEAD_REF master - PATCHES CMakeLists-windows.patch ) vcpkg_configure_cmake( @@ -16,7 +15,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.0) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.1) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/versions/baseline.json b/versions/baseline.json index 06a16352a..e93726249 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2805,7 +2805,7 @@ "port-version": 0 }, "kuku": { - "baseline": "2.0", + "baseline": "2.1", "port-version": 0 }, "kvasir-mpl": { diff --git a/versions/k-/kuku.json b/versions/k-/kuku.json index aaecc00d2..f36455df0 100644 --- a/versions/k-/kuku.json +++ b/versions/k-/kuku.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e58629ddfc48942517bb6dfc2dc12151cfcd0b2a", + "version-string": "2.1", + "port-version": 0 + }, { "git-tree": "0fc041176d953501d771e467d5621e635cd3f2a6", "version-string": "2.0", -- cgit v1.2.3