From 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 Mon Sep 17 00:00:00 2001 From: John Spaith Date: Thu, 26 Sep 2019 10:28:03 -0700 Subject: Use patch instead of trying to jump to unapproved change in repo --- ports/azure-iot-sdk-c/cmake-hsm-option.patch | 20 ++++++++++++++++++++ ports/azure-iot-sdk-c/portfile.cmake | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/azure-iot-sdk-c/cmake-hsm-option.patch diff --git a/ports/azure-iot-sdk-c/cmake-hsm-option.patch b/ports/azure-iot-sdk-c/cmake-hsm-option.patch new file mode 100644 index 000000000..ea6af5c23 --- /dev/null +++ b/ports/azure-iot-sdk-c/cmake-hsm-option.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2c51de83..5d42dc441 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,9 +121,12 @@ if (${use_prov_client}) + set(use_prov_client_core ON) + + if ("${hsm_custom_lib}" STREQUAL "") +- set(hsm_type_x509 ON) +- set(hsm_type_sastoken ON) +- set(hsm_type_symm_key ON) ++ if ((NOT ${hsm_type_x509}) AND (NOT ${hsm_type_sastoken}) AND (NOT ${hsm_type_symm_key})) ++ # If the cmake option did not explicitly configure an hsm type, then enable them all. ++ set(hsm_type_x509 ON) ++ set(hsm_type_sastoken ON) ++ set(hsm_type_symm_key ON) ++ endif() + else() + set(hsm_type_custom ON) + endif() diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index ca2b92532..e1a2d202e 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -9,7 +9,7 @@ if("public-preview" IN_LIST FEATURES) REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f HEAD_REF public-preview - PATCHES improve-external-deps.patch + PATCHES improve-external-deps.patch cmake-hsm-option.patch ) else() vcpkg_from_github( -- cgit v1.2.3