From f6ce6eb4037cf52be35b418e72445e83fa3e4554 Mon Sep 17 00:00:00 2001 From: "Joakim L. Gilje" Date: Tue, 13 Oct 2020 00:20:01 +0200 Subject: [botan] ask for amalgamation build on windows (#13936) * ask for amalgamation build on windows to avoid linker errors due to long command line * bump port-version on botan * made the amalgamation build user-selectable via feature-flags --- ports/botan/CONTROL | 4 ++++ ports/botan/portfile.cmake | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 871381e57..5c3808a51 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,4 +1,8 @@ Source: botan Version: 2.15.0 +Port-Version: 1 Homepage: https://botan.randombit.net Description: A cryptography library written in C++11 + +Feature: amalgamation +Description: Do an amalgamation build of the library diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index a00253e3f..37ca79662 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -46,6 +46,10 @@ else() message(FATAL_ERROR "Unsupported architecture") endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + amalgamation BOTAN_AMALGAMATION +) + function(BOTAN_BUILD BOTAN_BUILD_TYPE) if(BOTAN_BUILD_TYPE STREQUAL "dbg") @@ -77,6 +81,10 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}) endif() + if("-DBOTAN_AMALGAMATION=ON" IN_LIST FEATURE_OPTIONS) + list(APPEND configure_arguments --amalgamation) + endif() + vcpkg_execute_required_process( COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" -- cgit v1.2.3