From 8eaf661f21efea5f628642fc28c9ebddbf4e0feb Mon Sep 17 00:00:00 2001 From: Ludvig Michaelsson Date: Wed, 20 Dec 2023 08:44:11 +0100 Subject: [PATCH 1/2] windows: bump LibreSSL to 3.8.2 --- windows/const.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/const.ps1 b/windows/const.ps1 index 7fac21e9..7ee15c4b 100644 --- a/windows/const.ps1 +++ b/windows/const.ps1 @@ -7,8 +7,8 @@ New-Variable -Name 'LIBRESSL_URL' ` -Value 'https://cloudflare.cdn.openbsd.org/pub/OpenBSD/LibreSSL' ` -Option Constant -New-Variable -Name 'LIBRESSL' -Value 'libressl-3.7.3' -Option Constant -New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto-50' -Option Constant +New-Variable -Name 'LIBRESSL' -Value 'libressl-3.8.2' -Option Constant +New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto' -Option Constant # libcbor coordinates. New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.10.2' -Option Constant From 3cbeb7ad05b4c1c3794c2de17671fc2e6d435ccd Mon Sep 17 00:00:00 2001 From: Ludvig Michaelsson Date: Fri, 22 Dec 2023 10:03:29 +0100 Subject: [PATCH 2/2] windows: specify CMAKE_MSVC_RUNTIME_LIBRARY for LibreSSL Static builds otherwise fail in the same manner described by commit 26e792ce6815b9a70edf87cb9864730332d830c8. --- windows/build.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/build.ps1 b/windows/build.ps1 index ff43d8b8..5ac045b3 100644 --- a/windows/build.ps1 +++ b/windows/build.ps1 @@ -146,6 +146,7 @@ try { -DBUILD_SHARED_LIBS="${SHARED}" -DLIBRESSL_TESTS=OFF ` -DCMAKE_C_FLAGS_DEBUG="${CFLAGS_DEBUG}" ` -DCMAKE_C_FLAGS_RELEASE="${CFLAGS_RELEASE}" ` + -DCMAKE_MSVC_RUNTIME_LIBRARY="${CMAKE_MSVC_RUNTIME_LIBRARY}" ` -DCMAKE_INSTALL_PREFIX="${PREFIX}" "${CMAKE_SYSTEM_VERSION}"; ` ExitOnError & $CMake --build . --config ${Config} --verbose; ExitOnError