From a3442bd387dc5995604ca05a4be3e2f2c8c93f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 12 Oct 2020 15:22:48 -0700 Subject: [nettle] Fix build failure on osx (#13959) * [nettle] Fix build failure on osx * Update ports/nettle/portfile.cmake * Update ports/nettle/portfile.cmake * Update ports/nettle/portfile.cmake * Update ports/nettle/portfile.cmake --- ports/nettle/CONTROL | 2 +- ports/nettle/portfile.cmake | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL index 48c42597e..f76d21412 100644 --- a/ports/nettle/CONTROL +++ b/ports/nettle/CONTROL @@ -1,6 +1,6 @@ Source: nettle Version: 3.5.1 -Port-Version: 3 +Port-Version: 4 Homepage: https://git.lysator.liu.se/nettle/nettle Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. Build-Depends: gmp, vs-yasm (windows) \ No newline at end of file diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 9ba1cf511..0d7a45eaf 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -108,12 +108,19 @@ else() HEAD_REF master # branch name PATCHES fix-InstallLibPath.patch ) + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OPTIONS --disable-static) + else() + set(OPTIONS --disable-shared) + endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG OPTIONS --disable-documentation + --disable-openssl ${OPTIONS} ) @@ -129,5 +136,3 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() - - -- cgit v1.2.3