diff options
| -rw-r--r-- | .patch/boost/0002-use-marmasm.patch | 11 | ||||
| -rw-r--r-- | .patch/boost/0003-armasm-options.patch | 14 | ||||
| -rw-r--r-- | cpmfile.json | 8 |
3 files changed, 3 insertions, 30 deletions
diff --git a/.patch/boost/0002-use-marmasm.patch b/.patch/boost/0002-use-marmasm.patch deleted file mode 100644 index 10f490b878..0000000000 --- a/.patch/boost/0002-use-marmasm.patch +++ /dev/null @@ -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() diff --git a/.patch/boost/0003-armasm-options.patch b/.patch/boost/0003-armasm-options.patch deleted file mode 100644 index 3869f95f6f..0000000000 --- a/.patch/boost/0003-armasm-options.patch +++ /dev/null @@ -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") diff --git a/cpmfile.json b/cpmfile.json index ff78a16b7f..0bb6afe88c 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -12,14 +12,12 @@ "repo": "boostorg/boost", "tag": "boost-%VERSION%", "artifact": "%TAG%-cmake.tar.xz", - "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9", - "git_version": "1.89.0", + "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d", + "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": { |