aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/boost-asio/CONTROL1
-rw-r--r--ports/boost-asio/inline_dummy_return.patch13
-rw-r--r--ports/boost-asio/portfile.cmake4
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index 0ab98158a..ad44a6be7 100644
--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by scripts/boost/generate-ports.ps1
Source: boost-asio
Version: 1.75.0
+Port-Version: 1
Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!arm&!uwp&!emscripten), 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/inline_dummy_return.patch b/ports/boost-asio/inline_dummy_return.patch
new file mode 100644
index 000000000..b4c29a631
--- /dev/null
+++ b/ports/boost-asio/inline_dummy_return.patch
@@ -0,0 +1,13 @@
+diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp
+index 60a6f5cd..af7be635 100644
+--- a/include/boost/asio/impl/use_awaitable.hpp
++++ b/include/boost/asio/impl/use_awaitable.hpp
+@@ -236,7 +236,7 @@ T dummy_return()
+ }
+
+ template <>
+-void dummy_return()
++inline void dummy_return()
+ {
+ }
+ #endif // defined(_MSC_VER)
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
index cbc976df0..2c5114526 100644
--- a/ports/boost-asio/portfile.cmake
+++ b/ports/boost-asio/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
REF boost-1.75.0
SHA512 5f332644207f87af8ffbf93d9f1f72b7ca6dfa96d77a871308951c492ae27fac20bad2bfdf4e1de06585c1405d1875c4d4335786b3fc08aa0a76ef4de3626c27
HEAD_REF master
- PATCHES windows_alloca_header.patch
+ PATCHES
+ windows_alloca_header.patch
+ inline_dummy_return.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)