Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lhg #1

Merged
merged 3 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions vcpkg-overlay/ports/boost-asio/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Automatically generated by scripts/boost/generate-ports.ps1

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/asio
REF boost-${VERSION}
SHA512 88d1d8d1bbea29149d9747ab9ccb99a7bfbd928f8ed1aff90adb6382fcefd32dc9687e6832f8ac21ddf918f0608623aa123d7943aa5f697a6b946fe2311e05f6
HEAD_REF master
PATCHES windows_alloca_header.patch
windows_handle_inheritance.patch
)

include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
59 changes: 59 additions & 0 deletions vcpkg-overlay/ports/boost-asio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-asio",
"version": "1.84.0",
"description": "Boost asio module",
"homepage": "https://github.com/boostorg/asio",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-align",
"version>=": "1.84.0"
},
{
"name": "boost-assert",
"version>=": "1.84.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
},
{
"name": "boost-context",
"platform": "!uwp & !emscripten",
"version>=": "1.84.0"
},
{
"name": "boost-coroutine",
"platform": "!(arm & windows) & !uwp & !emscripten",
"version>=": "1.84.0"
},
{
"name": "boost-date-time",
"version>=": "1.84.0"
},
{
"name": "boost-system",
"version>=": "1.84.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.84.0"
}
],
"features": {
"ssl": {
"description": "Build with SSL support",
"dependencies": [
{
"name": "openssl",
"platform": "!emscripten"
}
]
}
}
}
15 changes: 15 additions & 0 deletions vcpkg-overlay/ports/boost-asio/windows_alloca_header.patch
Original file line number Diff line number Diff line change
@@ -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>
13 changes: 13 additions & 0 deletions vcpkg-overlay/ports/boost-asio/windows_handle_inheritance.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/include/boost/asio/detail/impl/socket_ops.ipp b/include/boost/asio/detail/impl/socket_ops.ipp
index 6e2b29b..d0ff1c7 100644
--- a/include/boost/asio/detail/impl/socket_ops.ipp
+++ b/include/boost/asio/detail/impl/socket_ops.ipp
@@ -1814,7 +1814,7 @@ socket_type socket(int af, int type, int protocol,
boost::system::error_code& ec)
{
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
- socket_type s = ::WSASocketW(af, type, protocol, 0, 0, WSA_FLAG_OVERLAPPED);
+ socket_type s = ::WSASocketW(af, type, protocol, 0, 0, WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
get_last_error(ec, s == invalid_socket);
if (s == invalid_socket)
return s;
Loading