Skip to content

Commit

Permalink
Patch vcpkg Boost
Browse files Browse the repository at this point in the history
  • Loading branch information
tuokri committed Feb 6, 2025
1 parent 9502bb7 commit c978012
Show file tree
Hide file tree
Showing 4 changed files with 155 additions and 0 deletions.
5 changes: 5 additions & 0 deletions build_commands_bot/vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"overlay-ports": [
"./vcpkg_ports"
]
}
15 changes: 15 additions & 0 deletions build_commands_bot/vcpkg_ports/boost-process/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/process
REF boost-${VERSION}
SHA512 a084c71effdd591b83a7fbff85bdea925da1436dc452267ceafd0f7bd875dcd9611cd28a92c06548e9130bb596703ea05932cd94063724cfecf6d861cceebe21
HEAD_REF master
PATCHES
processv2.patch
)

set(FEATURE_OPTIONS "")
boost_configure_and_install(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
)
43 changes: 43 additions & 0 deletions build_commands_bot/vcpkg_ports/boost-process/processv2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 0906082579f83a4875e5489eb34df9049d2d8cd1 Mon Sep 17 00:00:00 2001
From: Benjamin Buch <[email protected]>
Date: Mon, 30 Sep 2024 10:09:45 +0200
Subject: [PATCH] remove dllimport from utf8.hpp to fix MSVC build

---
include/boost/process/v2/detail/utf8.hpp | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/boost/process/v2/detail/utf8.hpp b/include/boost/process/v2/detail/utf8.hpp
index 86add628d..a31cdff4d 100644
--- a/include/boost/process/v2/detail/utf8.hpp
+++ b/include/boost/process/v2/detail/utf8.hpp
@@ -23,8 +23,7 @@ BOOST_PROCESS_V2_DECL std::size_t convert_to_wide(const char * in, std::size_

template<typename CharOut, typename Traits = std::char_traits<CharOut>,
typename Allocator = std::allocator<CharOut>, typename CharIn,
- typename = typename std::enable_if<std::is_same<CharOut, CharIn>::value>::type>
-BOOST_PROCESS_V2_DECL
+ typename = typename std::enable_if<std::is_same<CharOut, CharIn>::value>::type>
std::basic_string<CharOut, Traits, Allocator> conv_string(
const CharIn * data, std::size_t size,
const Allocator allocator = Allocator{})
@@ -35,8 +34,7 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(

template<typename CharOut, typename Traits = std::char_traits<CharOut>,
typename Allocator = std::allocator<CharOut>,
- typename = typename std::enable_if<std::is_same<CharOut, char>::value>::type>
-BOOST_PROCESS_V2_DECL
+ typename = typename std::enable_if<std::is_same<CharOut, char>::value>::type>
std::basic_string<CharOut, Traits, Allocator> conv_string(
const wchar_t * data, std::size_t size,
const Allocator allocator = Allocator{})
@@ -59,8 +57,7 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(

template<typename CharOut, typename Traits = std::char_traits<CharOut>,
typename Allocator = std::allocator<CharOut>,
- typename = typename std::enable_if<std::is_same<CharOut, wchar_t>::value>::type>
-BOOST_PROCESS_V2_DECL
+ typename = typename std::enable_if<std::is_same<CharOut, wchar_t>::value>::type>
std::basic_string<CharOut, Traits, Allocator> conv_string(
const char * data, std::size_t size,
const Allocator allocator = Allocator{})
92 changes: 92 additions & 0 deletions build_commands_bot/vcpkg_ports/boost-process/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-process",
"version": "1.86.0",
"description": "Boost process module",
"homepage": "https://www.boost.org/libs/process",
"license": "BSL-1.0",
"supports": "!uwp & !emscripten & !android",
"dependencies": [
{
"name": "boost-algorithm",
"version>=": "1.86.0"
},
{
"name": "boost-asio",
"version>=": "1.86.0"
},
{
"name": "boost-assert",
"version>=": "1.86.0"
},
{
"name": "boost-cmake",
"version>=": "1.86.0"
},
{
"name": "boost-config",
"version>=": "1.86.0"
},
{
"name": "boost-core",
"version>=": "1.86.0"
},
{
"name": "boost-filesystem",
"platform": "!uwp",
"version>=": "1.86.0"
},
{
"name": "boost-fusion",
"version>=": "1.86.0"
},
{
"name": "boost-headers",
"version>=": "1.86.0"
},
{
"name": "boost-io",
"version>=": "1.86.0"
},
{
"name": "boost-iterator",
"version>=": "1.86.0"
},
{
"name": "boost-move",
"version>=": "1.86.0"
},
{
"name": "boost-optional",
"version>=": "1.86.0"
},
{
"name": "boost-system",
"version>=": "1.86.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.86.0"
},
{
"name": "boost-tokenizer",
"version>=": "1.86.0"
},
{
"name": "boost-type-index",
"version>=": "1.86.0"
},
{
"name": "boost-type-traits",
"version>=": "1.86.0"
},
{
"name": "boost-utility",
"version>=": "1.86.0"
},
{
"name": "boost-winapi",
"version>=": "1.86.0"
}
]
}

0 comments on commit c978012

Please sign in to comment.