diff options
| author | denis-gz <denis.gz@gmail.com> | 2019-07-18 10:14:48 +0300 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-07-18 00:14:48 -0700 |
| commit | 54b39598e1880f0cab60a9fcc448745711d2d2e9 (patch) | |
| tree | f8f7d8f9c31cf8186728cbb20337b8e6ada716fc | |
| parent | 2467136b314f33b61579637a6a6d1390d2f95381 (diff) | |
| download | vcpkg-54b39598e1880f0cab60a9fcc448745711d2d2e9.tar.gz vcpkg-54b39598e1880f0cab60a9fcc448745711d2d2e9.zip | |
[boost-asio] fix on Windows (#7267)
| -rw-r--r-- | ports/boost-asio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-asio/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/boost-asio/windows_alloca_header.patch | 15 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL index 3d93e7c07..123d9f854 100644 --- a/ports/boost-asio/CONTROL +++ b/ports/boost-asio/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-asio
-Version: 1.70.0-1
+Version: 1.70.0-2
Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
Homepage: https://github.com/boostorg/asio
Description: Boost asio module
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index dbb2b239c..f24dd1aed 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF boost-1.70.0
SHA512 394c7e557d97bbb8b98453846a098c8ab7f4eb92d752bd4089d2020e0d5060cff1e53f5e50b2f8910e64b66c934b2bde4a7137bd1a6050e8b1279c2e4576b2e5
HEAD_REF master
+ PATCHES windows_alloca_header.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-asio/windows_alloca_header.patch b/ports/boost-asio/windows_alloca_header.patch new file mode 100644 index 000000000..609e1ebfe --- /dev/null +++ b/ports/boost-asio/windows_alloca_header.patch @@ -0,0 +1,15 @@ +diff --git a/include/boost/asio/detail/impl/socket_ops.ipp b/include/boost/asio/detail/impl/socket_ops.ipp +index 7d7c31f..d2cd468 100644 +--- a/include/boost/asio/detail/impl/socket_ops.ipp ++++ b/include/boost/asio/detail/impl/socket_ops.ipp +@@ -27,6 +27,10 @@ + #include <boost/asio/detail/socket_ops.hpp> + #include <boost/asio/error.hpp> + ++#if defined(BOOST_ASIO_WINDOWS) ++#include <malloc.h> ++#endif ++ + #if defined(BOOST_ASIO_WINDOWS_RUNTIME) + # include <codecvt> + # include <locale> |