[apsi] fix baseline regression (#29193)

microsoft · Jan 26, 2023 · 042fc50 · 042fc50
1 parent 4efb7ed
commit 042fc50
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/ports/apsi/fix-find_package.patch b/ports/apsi/fix-find_package.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0951577..c5efa1e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,7 +117,7 @@ set(APSI_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/APSI-${APSI_VERSION_MA
+ # find_package might throw a FATAL_ERROR before"xxx: not found", e.g. with vcpkg.cmake.
+
+ # Microsoft SEAL
+-find_package(SEAL 4 QUIET REQUIRED)
++find_package(SEAL 4.1 QUIET REQUIRED)
+ if(NOT SEAL_FOUND)
+     message(FATAL_ERROR "Microsoft SEAL: not found")
+ else()
diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF 2dff8dcd39c361527ea3b320f87cb8e71dd4f777 #0.9.0
     SHA512 16c52642719f1d67dfaa70d963ba8795ac618f250752a1f95d91d4b1db8b51b2598999dcc9a9a7a3dbe8537943a3c3bf2ec684cd2697fca88135b01009961213
     HEAD_REF main
+    PATCHES
+        fix-find_package.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "apsi",
   "version-semver": "0.9.0",
+  "port-version": 1,
   "description": "APSI is a research library for asymmetric private set intersection.",
   "homepage": "https://github.com/microsoft/APSI",
   "license": "MIT",

diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c1614133f3e08c8203102a2dd519c759b01d7156",
+      "version-semver": "0.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3fe18a82f71344cfd2a936fb6ddf4a6762edfffa",
       "version-semver": "0.9.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -142,7 +142,7 @@
     },
     "apsi": {
       "baseline": "0.9.0",
-      "port-version": 0
+      "port-version": 1
     },
     "arb": {
       "baseline": "2.21.1",