diff options
| author | Wei Dai <wei.dai@microsoft.com> | 2021-06-21 14:07:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 14:07:53 -0700 |
| commit | fbab325f475613532bf53110ed49e185851a793c (patch) | |
| tree | 4089376b2396d06fb345a9a954a7eef807785e1d | |
| parent | 86a2be3f69a08c26eedffe126dff260da06b5503 (diff) | |
| download | vcpkg-fbab325f475613532bf53110ed49e185851a793c.tar.gz vcpkg-fbab325f475613532bf53110ed49e185851a793c.zip | |
[seal]Updated to version 3.6.6. Replaced CONTROL with manifest file. (#18457)
* Updated seal to version 3.6.6. Replaced CONTROL with manifest file.
* Changed version-string to version-semver.
* Updated versions/s-/seal.json.
* Added a missing CMake arguement.
* Updated versioning.
* Fixed hexl config file.
* Updated versioning.
* Fixed hexl not finding dependency.
* Updated versioning.
| -rw-r--r-- | ports/hexl/find_dependency_cpu_features.patch | 31 | ||||
| -rw-r--r-- | ports/hexl/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/seal/CONTROL | 22 | ||||
| -rw-r--r-- | ports/seal/portfile.cmake | 45 | ||||
| -rw-r--r-- | ports/seal/vcpkg.json | 51 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/h-/hexl.json | 2 | ||||
| -rw-r--r-- | versions/s-/seal.json | 5 |
8 files changed, 112 insertions, 50 deletions
diff --git a/ports/hexl/find_dependency_cpu_features.patch b/ports/hexl/find_dependency_cpu_features.patch new file mode 100644 index 000000000..fbc79ec87 --- /dev/null +++ b/ports/hexl/find_dependency_cpu_features.patch @@ -0,0 +1,31 @@ +From b399342016573d6f45bd5bb1aa8d4df358e0761c Mon Sep 17 00:00:00 2001 +From: Wei Dai <wei.dai@microsoft.com> +Date: Wed, 16 Jun 2021 18:21:51 -0700 +Subject: [PATCH] Fixed config. + +--- + cmake/HEXLConfig.cmake.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/cmake/HEXLConfig.cmake.in b/cmake/HEXLConfig.cmake.in +index 57089bd..f112380 100644 +--- a/cmake/HEXLConfig.cmake.in ++++ b/cmake/HEXLConfig.cmake.in +@@ -11,6 +11,14 @@ + + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(CpuFeatures) ++if(NOT CpuFeatures_FOUND) ++ message(WARNING "Could not find dependency `CpuFeatures` required by this configuration") ++ set(HEXL_FOUND FALSE) ++ return() ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/HEXLTargets.cmake) + + # Defines HEXL_FOUND: If Intel HEXL library was found +-- +2.25.1 + diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index e6f3857fb..fa3362c66 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -7,7 +7,9 @@ vcpkg_from_github( REF 2dc1db6824be3fc89d13740efd0270ec9afec77e SHA512 aaa80dc53a21586d763a2b84b40d60062020470988422601bc5e9c2b31c6263847a97ea8f956d002a95e2d5e843cafa96fabdfd8b8ee892c7a7b9747133adebb HEAD_REF main - PATCHES disable_downloading_cpu_features.patch + PATCHES + disable_downloading_cpu_features.patch + find_dependency_cpu_features.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/seal/CONTROL b/ports/seal/CONTROL deleted file mode 100644 index 7eb437be1..000000000 --- a/ports/seal/CONTROL +++ /dev/null @@ -1,22 +0,0 @@ -Source: seal -Version: 3.6.4 -Homepage: https://github.com/microsoft/SEAL -Description: Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library. -Supports: !windows | (windows & static) -Default-Features: ms-gsl, zlib, zstd - -Feature: ms-gsl -Build-Depends: ms-gsl -Description: Use ms-gsl for span view - -Feature: zlib -Build-Depends: zlib -Description: Use zlib for compressed serialization - -Feature: zstd -Build-Depends: zstd -Description: Use zstd for compressed serialization - -Feature: no-throw-tran -Build-Depends: -Description: Do not throw when operating on transparent ciphertexts diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index e5081986f..f24241a3f 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,49 +3,44 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 0b058d99b7f18a00e5ebb2b80caee593804b0500 - SHA512 eed4e4360e32c8506a8f84b9bcfd2c8debf0013ee181f37fb34c6b94e62bbde1993ee400a3f589fe2378b598dd4fdb2e8532b706691a9348e464cd1a202ef23c + REF d045f1beff96dff0fccc7fa0c5acb1493a65338c + SHA512 9b5d3c4342608d8e3d9826d3b52cbefc1c21eb0094d0cae4add8bb0960f931e9080f248eb8ad8385fc0a08e2a1da10020185148ffd2ef02e7a4fac879e27aa69 HEAD_REF main ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - ms-gsl SEAL_USE_MSGSL - zlib SEAL_USE_ZLIB - zstd SEAL_USE_ZSTD - + ms-gsl SEAL_USE_MSGSL + zlib SEAL_USE_ZLIB + zstd SEAL_USE_ZSTD + hexl SEAL_USE_INTEL_HEXL INVERTED_FEATURES - no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT + no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DSEAL_BUILD_DEPS=OFF - -DSEAL_BUILD_EXAMPLES=OFF - -DSEAL_BUILD_TESTS=OFF - -DSEAL_BUILD_SEAL_C=OFF + "-DSEAL_BUILD_DEPS=OFF" + "-DSEAL_BUILD_EXAMPLES=OFF" + "-DSEAL_BUILD_TESTS=OFF" + "-DSEAL_BUILD_SEAL_C=OFF" ${FEATURE_OPTIONS} ) -vcpkg_build_cmake(TARGET seal LOGFILE_ROOT build) +vcpkg_cmake_install() -vcpkg_install_cmake() +vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/") -file(GLOB CONFIG_PATH RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/SEAL-*") -if(NOT CONFIG_PATH) - message(FATAL_ERROR "Could not find installed cmake config files.") +if("hexl" IN_LIST FEATURES) + vcpkg_fixup_pkgconfig(SKIP_CHECK) +else() + vcpkg_fixup_pkgconfig() endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH "${CONFIG_PATH}") - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") vcpkg_copy_pdbs() diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json new file mode 100644 index 000000000..ef5b166a5 --- /dev/null +++ b/ports/seal/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "seal", + "version-semver": "3.6.6", + "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", + "homepage": "https://github.com/microsoft/SEAL", + "supports": "!windows | (windows & static)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "ms-gsl", + "zlib", + "zstd" + ], + "features": { + "hexl": { + "description": "Use IntelĀ® HEXL for acceleration of low-level kernels.", + "dependencies": [ + "hexl" + ] + }, + "ms-gsl": { + "description": "Use ms-gsl for span view", + "dependencies": [ + "ms-gsl" + ] + }, + "no-throw-tran": { + "description": "Do not throw when operating on transparent ciphertexts" + }, + "zlib": { + "description": "Use zlib for compressed serialization", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Use zstd for compressed serialization", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 938c4cbab..c993f9351 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5681,7 +5681,7 @@ "port-version": 0 }, "seal": { - "baseline": "3.6.4", + "baseline": "3.6.6", "port-version": 0 }, "secp256k1": { diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index 4a58571b0..dbee52a46 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7f5bcef6355a0cb88d04f4a3664568c74e2fd6bb", + "git-tree": "abbac3846835a67c818b2fd51c32a1e859aca7b3", "version": "1.1.0", "port-version": 0 } diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 4224e7832..53e227f6d 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e487b9120a78480800a1fd914477acf03f677919", + "version-semver": "3.6.6", + "port-version": 0 + }, + { "git-tree": "aa3ad12b6022d47b57c3482ed9f413bc374b9396", "version-string": "3.6.4", "port-version": 0 |
