Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ports/apsi/fix-c2398.patch

This file was deleted.

13 changes: 0 additions & 13 deletions ports/apsi/fix-find-kuku.patch

This file was deleted.

13 changes: 0 additions & 13 deletions ports/apsi/fix-find-seal.patch

This file was deleted.

13 changes: 0 additions & 13 deletions ports/apsi/fix-jsoncpp-target.patch

This file was deleted.

28 changes: 0 additions & 28 deletions ports/apsi/fix-log4cplus-byte-ambiguity.patch

This file was deleted.

35 changes: 16 additions & 19 deletions ports/apsi/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,21 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/APSI
REF "v${VERSION}"
SHA512 ad49e169970921175728705c6f5fe8062e74900a601ea25e9f836840a221175bfbb3169717787b1ca7e2e1a0b26630690dcef9bc91c0123877b856ea927e9e68
SHA512 4abee66e646b2ff9cd020bbb6949bb9f2a409a2ef7f4aeb2b07966486f90f5a0f4e904503647a5d7ac4d8e37e933c1a9335b114a99ea0571c2ee0427d701e1a6
HEAD_REF main
PATCHES
fix-find-seal.patch
fix-c2398.patch
fix-find-kuku.patch
fix-log4cplus-byte-ambiguity.patch
# https://github.com/microsoft/APSI/issues/84
fix-jsoncpp-target.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
log4cplus APSI_USE_LOG4CPLUS
zeromq APSI_USE_ZMQ
)

# APSI probes for AVX support by running a test program, which a cross-build cannot do. The
# probe is reached only on AMD64, where the vendored FourQ can use the extensions; elsewhere
# architecture detection is a compile-only check and needs no help.
set(CROSSCOMP_OPTIONS "")
if (VCPKG_CROSSCOMPILING)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT='')
endif()
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_AMD64_EXITCODE=0 -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1)
endif()
if(VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(CROSSCOMP_OPTIONS -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1)
endif()

vcpkg_cmake_configure(
Expand All @@ -42,8 +32,15 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/APSI-0.11")
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/APSI-1.0")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Upstream installs LICENSE and NOTICE under share/licenses/APSI-1.0. vcpkg's canonical
# location is share/apsi/copyright, which vcpkg_install_copyright writes from those same two
# files below, so drop upstream's copy along with the debug/share it would otherwise leave.
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/share/licenses"
)

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${SOURCE_PATH}/NOTICE")
22 changes: 9 additions & 13 deletions ports/apsi/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
{
"name": "apsi",
"version-semver": "0.11.0",
"port-version": 3,
"version-semver": "1.0.1",
"description": "APSI is a research library for asymmetric private set intersection.",
"homepage": "https://github.com/microsoft/APSI",
"license": "MIT",
"license": "MIT AND Zlib",
"dependencies": [
"flatbuffers",
"jsoncpp",
{
"name": "jsoncpp",
"version>=": "1.9.5"
},
"kuku",
"ms-gsl",
{
"name": "seal",
"default-features": false,
"features": [
"ms-gsl",
"no-throw-tran",
"zstd"
]
],
"version>=": "4.4.5"
},
{
"name": "vcpkg-cmake",
Expand All @@ -28,7 +31,6 @@
}
],
"default-features": [
"log4cplus",
"zeromq"
],
"features": {
Expand All @@ -44,12 +46,6 @@
}
]
},
"log4cplus": {
"description": "Use log4cplus for logging.",
"dependencies": [
"log4cplus"
]
},
"zeromq": {
"description": "Use ZeroMQ for networking.",
"dependencies": [
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/apsi.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "97041cd83e979b3c8d74c5ec36c2a1add3204884",
"version-semver": "1.0.1",
"port-version": 0
},
{
"git-tree": "575057c1d1eb4bf8ba68bdd8eb774a857eac66b8",
"version-semver": "0.11.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@
"port-version": 0
},
"apsi": {
"baseline": "0.11.0",
"port-version": 3
"baseline": "1.0.1",
"port-version": 0
},
"aravis": {
"baseline": "0.8.36",
Expand Down
Loading