diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/openssl-uwp | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/openssl-uwp')
| -rw-r--r-- | ports/openssl-uwp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl-uwp/fix-uwp-rs4.patch | 26 | ||||
| -rw-r--r-- | ports/openssl-uwp/portfile.cmake | 3 |
3 files changed, 2 insertions, 29 deletions
diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index aa0348e0b..c11c10124 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2r +Version: 1.0.2r-1 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-uwp/fix-uwp-rs4.patch b/ports/openssl-uwp/fix-uwp-rs4.patch deleted file mode 100644 index d5a33909e..000000000 --- a/ports/openssl-uwp/fix-uwp-rs4.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/ms/winrtdef.h b/ms/winrtdef.h
-index b1a7598..6ba2e1d 100644
---- a/ms/winrtdef.h
-+++ b/ms/winrtdef.h
-@@ -6,9 +6,11 @@
- #if defined(OPENSSL_WINAPP)
- //Include stdio.h to replace fprintf
- # include<stdio.h>
-+#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < NTDDI_WIN10_RS4)
- # ifdef getenv
- # undef getenv
- # endif
-+#endif
- # ifdef setenv
- # undef setenv
- # endif
-@@ -32,7 +34,9 @@
- # undef GetModuleHandle
- # define GetModuleHandle winrt_GetModuleHandle
- # endif
-+#if !defined(NTDDI_WIN10_RS4) || (NTDDI_VERSION < NTDDI_WIN10_RS4)
- # define getenv winrt_getenv
-+#endif
- # define setenv winrt_getenv
-
- int winrt_GetTickCount(void);
diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index 239f98d2b..0a80bc326 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -37,8 +37,7 @@ vcpkg_from_github( SHA512 3045693fca4b042b69675f6164d8cc82106582cf31081d65a0adbd528f04e77fa48b3761f3be7bdf8ab962a093b28fec0ae6d7da02058f2b049f79b784c39c2e HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-configure-unicode.patch + fix-uwp-configure-unicode.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) |