diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 02:12:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 02:12:59 -0700 |
| commit | f29c2a38924748378ccd2f9ef9dfdc1ce95c30e4 (patch) | |
| tree | b766f464fafdee393d9457054c2aae1728623e49 | |
| parent | e5dc8ab8cee95e164af5bccf1a9d0b6f226b79bd (diff) | |
| parent | a2f2df640cd6fed54ddeb7579fd8938df13ab35a (diff) | |
| download | vcpkg-f29c2a38924748378ccd2f9ef9dfdc1ce95c30e4.tar.gz vcpkg-f29c2a38924748378ccd2f9ef9dfdc1ce95c30e4.zip | |
Merge pull request #1230 from zabulus/openssl
[openssl] Fix pathlib
| -rw-r--r-- | ports/openssl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl/fix-uwp-pathlib.patch | 13 | ||||
| -rw-r--r-- | ports/openssl/portfile-uwp.cmake | 5 |
3 files changed, 19 insertions, 1 deletions
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. 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..df1776eaa 100644 --- a/ports/openssl/portfile-uwp.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -40,6 +40,11 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) +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) |