[apsi] update to v0.8.2 and fix supports (#25461)

* update to v0.8.1 and fix supports

* skip x86-windows and arm64-windows in ci.baseline

* add x86-windows and arm64-windows supports

* update

* update

Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
Mengna Li 2022-07-12 04:57:02 +08:00 committed by GitHub
parent 98f8d00e89
commit 0c5939ea29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 8 deletions

View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/APSI
REF 6365cb774b81a2a731334c656db21e5fdfb92870
SHA512 f21d710a345663aeb35035565c55fd900076589d087a03a1ad7df8b8004ae0e059196f3c94ee63b5ad815a858e5404eea34ae203f7778d4190fd323fd08b7084
REF ba71aeb28a9f21e4ad59c45aa88232b099ce0b87 #0.8.2
SHA512 810bcbe0afa3d1c9d299a85bc4266135bdf9adc33bfc754c59731f6cfa6a89d449fb134cef34c4614742bd50e9f8f3916e5b64998dcea69883ca27b7da3c5f04
HEAD_REF main
)
@ -14,6 +14,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
zeromq APSI_USE_ZMQ
)
set(CROSSCOMP_OPTIONS "")
if (NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT="")
endif()
endif()
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
DISABLE_PARALLEL_CONFIGURE
@ -21,11 +28,12 @@ vcpkg_cmake_configure(
"-DAPSI_BUILD_TESTS=OFF"
"-DAPSI_BUILD_CLI=OFF"
${FEATURE_OPTIONS}
${CROSSCOMP_OPTIONS}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.7")
vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.8")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,10 +1,9 @@
{
"name": "apsi",
"version-semver": "0.7.0",
"port-version": 2,
"version-semver": "0.8.2",
"description": "APSI is a research library for asymmetric private set intersection.",
"homepage": "https://github.com/microsoft/APSI",
"supports": "static & !(arm & osx)",
"license": "MIT",
"dependencies": [
"flatbuffers",
"jsoncpp",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cbe91971ef248ba844e254d91cbd73ad10fbe131",
"version-semver": "0.8.2",
"port-version": 0
},
{
"git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03",
"version-semver": "0.7.0",

View File

@ -125,8 +125,8 @@
"port-version": 7
},
"apsi": {
"baseline": "0.7.0",
"port-version": 2
"baseline": "0.8.2",
"port-version": 0
},
"arb": {
"baseline": "2.21.1",