chore: Restore boost-asio promise patch

Tradias · Dec 18, 2023 · c2b0cb5 · c2b0cb5
1 parent abdaf5f
commit c2b0cb5
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 0 deletions.
diff --git a/deps/boost-asio/portfile.cmake b/deps/boost-asio/portfile.cmake
@@ -0,0 +1,19 @@
+# Automatically generated by scripts/boost/generate-ports.ps1
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH
+    SOURCE_PATH
+    REPO
+    boostorg/asio
+    REF
+    boost-1.83.0
+    SHA512
+    83e6f39a4b8e54c89e7e7d322acc9e52a83a2a37f45c834a0267f0dbc1219314ad008f4f97e4cddc0a0c15dbea1785681181cea2e903773bdb31176875e0af95
+    HEAD_REF
+    master
+    PATCHES
+    windows_alloca_header.patch
+    promise.patch)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/deps/boost-asio/promise.patch b/deps/boost-asio/promise.patch
@@ -0,0 +1,21 @@
+diff --git a/include/boost/asio/experimental/impl/promise.hpp b/include/boost/asio/experimental/impl/promise.hpp
+index 0cab8475..2dd2efc2 100644
+--- a/include/boost/asio/experimental/impl/promise.hpp
++++ b/include/boost/asio/experimental/impl/promise.hpp
+@@ -40,6 +40,7 @@ template<typename... Ts, typename Executor, typename Allocator>
+ struct promise_impl<void(Ts...), Executor, Allocator>
+ {
+   using result_type = std::tuple<Ts...>;
++  static constexpr auto ALIGN = alignof(result_type);
+
+   promise_impl(Allocator allocator, Executor executor)
+     : allocator(std::move(allocator)), executor(std::move(executor))
+@@ -58,7 +59,7 @@ struct promise_impl<void(Ts...), Executor, Allocator>
+   }
+
+   typename aligned_storage<sizeof(result_type),
+-    alignof(result_type)>::type result;
++    ALIGN>::type result;
+   std::atomic<bool> done{false};
+   cancellation_signal cancel;
+   Allocator allocator;
diff --git a/deps/boost-asio/vcpkg.json b/deps/boost-asio/vcpkg.json
@@ -0,0 +1,99 @@
+{
+  "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
+  "name": "boost-asio",
+  "version": "1.83.0",
+  "description": "Boost asio module",
+  "homepage": "https://github.com/boostorg/asio",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "boost-align",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-array",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-assert",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-bind",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-chrono",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-config",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-context",
+      "platform": "!uwp & !emscripten",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-core",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-coroutine",
+      "platform": "!(arm & windows) & !uwp & !emscripten",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-date-time",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-exception",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-function",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-regex",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-smart-ptr",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-system",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-throw-exception",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-type-traits",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-utility",
+      "version>=": "1.83.0"
+    },
+    {
+      "name": "boost-vcpkg-helpers",
+      "version>=": "1.83.0"
+    }
+  ],
+  "features": {
+    "ssl": {
+      "description": "Build with SSL support",
+      "dependencies": [
+        {
+          "name": "openssl",
+          "platform": "!emscripten"
+        }
+      ]
+    }
+  }
+}
diff --git a/deps/boost-asio/windows_alloca_header.patch b/deps/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>