Browse Source
[externals] Update Boost to 1.90.0
Removes the need for those MSVC/ARM patches
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3448/head
crueter
6 days ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
2 additions and
29 deletions
-
.patch/boost/0002-use-marmasm.patch
-
.patch/boost/0003-armasm-options.patch
-
cpmfile.json
|
|
|
@ -1,11 +0,0 @@ |
|
|
|
--- 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() |
|
|
|
@ -1,14 +0,0 @@ |
|
|
|
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") |
|
|
|
@ -13,13 +13,11 @@ |
|
|
|
"tag": "boost-%VERSION%", |
|
|
|
"artifact": "%TAG%-cmake.tar.xz", |
|
|
|
"hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9", |
|
|
|
"git_version": "1.89.0", |
|
|
|
"git_version": "1.90.0", |
|
|
|
"version": "1.57", |
|
|
|
"find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem", |
|
|
|
"patches": [ |
|
|
|
"0001-clang-cl.patch", |
|
|
|
"0002-use-marmasm.patch", |
|
|
|
"0003-armasm-options.patch" |
|
|
|
"0001-clang-cl.patch" |
|
|
|
] |
|
|
|
}, |
|
|
|
"fmt": { |
|
|
|
|