Browse Source
fix patch, use unix endings
Signed-off-by: crueter <crueter@crueter.xyz>
pull/348/head
crueter
6 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
35 additions and
35 deletions
-
.patch/boost/0001-clang-cl.patch
-
.patch/boost/0002-use-marmasm.patch
-
.patch/boost/0003-armasm-options.patch
|
|
|
@ -1,13 +1,13 @@ |
|
|
|
diff --git a/libs/cobalt/include/boost/cobalt/concepts.hpp b/libs/cobalt/include/boost/cobalt/concepts.hpp
|
|
|
|
index d49f2ec..a9bdb80 100644
|
|
|
|
--- a/libs/cobalt/include/boost/cobalt/concepts.hpp
|
|
|
|
+++ b/libs/cobalt/include/boost/cobalt/concepts.hpp
|
|
|
|
@@ -62,7 +62,7 @@ struct enable_awaitables
|
|
|
|
template <typename T> |
|
|
|
concept with_get_executor = requires (T& t) |
|
|
|
{ |
|
|
|
- {t.get_executor()} -> asio::execution::executor;
|
|
|
|
+ t.get_executor();
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
diff --git a/libs/cobalt/include/boost/cobalt/concepts.hpp b/libs/cobalt/include/boost/cobalt/concepts.hpp
|
|
|
|
index d49f2ec..a9bdb80 100644
|
|
|
|
--- a/libs/cobalt/include/boost/cobalt/concepts.hpp
|
|
|
|
+++ b/libs/cobalt/include/boost/cobalt/concepts.hpp
|
|
|
|
@@ -62,7 +62,7 @@ struct enable_awaitables
|
|
|
|
template <typename T> |
|
|
|
concept with_get_executor = requires (T& t) |
|
|
|
{ |
|
|
|
- {t.get_executor()} -> asio::execution::executor;
|
|
|
|
+ t.get_executor();
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -1,11 +1,11 @@ |
|
|
|
--- a/libs/context/CMakeLists.txt 2025-09-08 00:42:31.303651800 -0400
|
|
|
|
+++ b/libs/context/CMakeLists.txt 2025-09-08 00:42:40.592184300 -0400
|
|
|
|
@@ -146,7 +146,7 @@
|
|
|
|
set(ASM_LANGUAGE ASM) |
|
|
|
endif() |
|
|
|
elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) |
|
|
|
- set(ASM_LANGUAGE ASM_ARMASM)
|
|
|
|
+ set(ASM_LANGUAGE ASM_MARMASM)
|
|
|
|
else() |
|
|
|
set(ASM_LANGUAGE ASM_MASM) |
|
|
|
endif() |
|
|
|
set(ASM_LANGUAGE ASM) |
|
|
|
endif() |
|
|
|
elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) |
|
|
|
- set(ASM_LANGUAGE ASM_ARMASM)
|
|
|
|
+ set(ASM_LANGUAGE ASM_MARMASM)
|
|
|
|
else() |
|
|
|
set(ASM_LANGUAGE ASM_MASM) |
|
|
|
endif() |
|
|
|
@ -1,14 +1,14 @@ |
|
|
|
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
|
|
|
|
index d6be702..0e59dd7 100644
|
|
|
|
--- a/libs/context/CMakeLists.txt
|
|
|
|
+++ b/libs/context/CMakeLists.txt
|
|
|
|
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
|
|
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh") |
|
|
|
endif() |
|
|
|
|
|
|
|
- elseif() # masm
|
|
|
|
+ # armasm doesn't support most of these options
|
|
|
|
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
|
|
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
|
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") |
|
|
|
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |
|
|
|
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
|
|
|
|
index 8210f65..0e59dd7 100644
|
|
|
|
--- a/libs/context/CMakeLists.txt
|
|
|
|
+++ b/libs/context/CMakeLists.txt
|
|
|
|
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
|
|
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh") |
|
|
|
endif() |
|
|
|
|
|
|
|
- else() # masm
|
|
|
|
+ # armasm doesn't support most of these options
|
|
|
|
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
|
|
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
|
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") |
|
|
|
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |