From 3aa59794717417d11366106ead0fcd943d63171f Mon Sep 17 00:00:00 2001 From: DCore Team <49679595+decent-dcore@users.noreply.github.com> Date: Wed, 22 Jan 2020 22:11:40 +0100 Subject: [pbc] Correct non Windows build (#9281) Co-authored-by: rfric <43748255+rfric@users.noreply.github.com> --- ports/pbc/CONTROL | 5 +++-- ports/pbc/portfile.cmake | 15 +++------------ scripts/ci.baseline.txt | 2 ++ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ports/pbc/CONTROL b/ports/pbc/CONTROL index ba09843de..b717ac1e5 100644 --- a/ports/pbc/CONTROL +++ b/ports/pbc/CONTROL @@ -1,4 +1,5 @@ Source: pbc -Version: 0.5.14-1 -Build-Depends: mpir +Version: 0.5.14-2 +Build-Depends: mpir (windows) +Homepage: https://crypto.stanford.edu/pbc Description: Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems. diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake index 32e233420..3f47fa56e 100644 --- a/ports/pbc/portfile.cmake +++ b/ports/pbc/portfile.cmake @@ -1,14 +1,4 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "PBC currently can only be built for desktop") -endif() - -if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "PBC currently can only be built using the dynamic CRT when building DLLs") -endif() +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") set(PBC_VERSION 0.5.14) @@ -78,8 +68,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME) ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info) - configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/pbc/copyright COPYONLY) + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) else() + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blynn/pbc diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 098c50c68..e17703b3b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1300,6 +1300,8 @@ pangomm:x64-windows=ignore pangomm:x86-windows=ignore parmetis:x64-linux=fail parmetis:x64-osx=fail +pbc:arm-uwp=fail +pbc:x64-uwp=fail pcre2:arm-uwp=fail pdal:x64-linux=fail pdal:x64-osx=fail -- cgit v1.2.3