From 41069b853078ce3ecfb5a66101c62ff84100e02e Mon Sep 17 00:00:00 2001 From: Hennadii Zabula Date: Thu, 1 Jun 2017 11:54:56 +0300 Subject: Fix openssl pathlib --- ports/openssl/fix-uwp-pathlib.patch | 13 +++++++++++++ ports/openssl/portfile-uwp.cmake | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 ports/openssl/fix-uwp-pathlib.patch diff --git a/ports/openssl/fix-uwp-pathlib.patch b/ports/openssl/fix-uwp-pathlib.patch new file mode 100644 index 000000000..17a1a4e10 --- /dev/null +++ b/ports/openssl/fix-uwp-pathlib.patch @@ -0,0 +1,13 @@ +diff --git "a/ms/setVSvars.bat" "b/ms/setVSvars.bat" +index e6ebc0a7..cde9afb2 100644 +--- "a/ms/setVSvars.bat" ++++ "b/ms/setVSvars.bat" +@@ -179,7 +179,7 @@ exit /b + call:setVar _VS14VC VisualStudio14VC + call:setVar _WKITS10 WindowsKits10.0 + set PATH=%_VS14VCBin%;%PATH% +- set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\1.0.0.0\" ++ set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\2.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\3.0.0.0\" + goto :eof + + :end diff --git a/ports/openssl/portfile-uwp.cmake b/ports/openssl/portfile-uwp.cmake index cf2f1e7ca..c752f554a 100644 --- a/ports/openssl/portfile-uwp.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -40,6 +40,13 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) +message(STATUS ${SOURCE_PATH}) + +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-pathlib.patch +) + file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) file(REMOVE_RECURSE ${SOURCE_PATH}/out32dll) file(REMOVE_RECURSE ${SOURCE_PATH}/inc32dll) -- cgit v1.2.3 From 55ec9354f4a619c1eb079efc21b5bb6502c36dcb Mon Sep 17 00:00:00 2001 From: Hennadii Zabula Date: Wed, 7 Jun 2017 09:55:44 +0300 Subject: Bump port package version --- ports/openssl/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index aaf7b17ab..c6de2ad68 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,3 +1,3 @@ Source: openssl -Version: 1.0.2k-3 +Version: 1.0.2k-4 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. -- cgit v1.2.3 From a2f2df640cd6fed54ddeb7579fd8938df13ab35a Mon Sep 17 00:00:00 2001 From: Hennadii Zabula Date: Wed, 7 Jun 2017 09:56:46 +0300 Subject: Remove redundant message --- ports/openssl/portfile-uwp.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/openssl/portfile-uwp.cmake b/ports/openssl/portfile-uwp.cmake index c752f554a..df1776eaa 100644 --- a/ports/openssl/portfile-uwp.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -40,8 +40,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) -message(STATUS ${SOURCE_PATH}) - vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-pathlib.patch -- cgit v1.2.3