diff options
| author | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-04-04 20:09:49 +0700 |
|---|---|---|
| committer | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-04-04 20:09:49 +0700 |
| commit | 30b56c86148babd61eb6c7c2807421bdcd8d3c13 (patch) | |
| tree | 8609cff09bc6c367cc4646d5f8aaf08f49da26f4 /ports/openssl | |
| parent | c681f4ee840c81a508fc0e8352c9aedf66fb5eaf (diff) | |
| parent | 599aea98c9a2ef587fd9deacdfcf64dfa2e3c4db (diff) | |
| download | vcpkg-30b56c86148babd61eb6c7c2807421bdcd8d3c13.tar.gz vcpkg-30b56c86148babd61eb6c7c2807421bdcd8d3c13.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/openssl')
| -rw-r--r-- | ports/openssl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 9266dd10d..d5ac7c890 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,3 +1,3 @@ Source: openssl -Version: 1.0.2o +Version: 1.0.2o-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/portfile.cmake b/ports/openssl/portfile.cmake index 458aa07b6..a6e5fd110 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -155,6 +155,10 @@ file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents) string(REPLACE "<winsock.h>" "<winsock2.h>" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}") +file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" _contents) +string(REPLACE "# include <windows.h>" "#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n# include <windows.h>" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}") + vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) |