Browse Source
WIP: [cmake] Use a debloated boost distribution
Should speed up fetch time
Signed-off-by: crueter <crueter@eden-emu.dev>
ext-boost
crueter
3 weeks ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
5 changed files with
11 additions and
31 deletions
-
.patch/boost/0001-clang-cl.patch
-
CMakeLists.txt
-
cpmfile.json
-
src/common/CMakeLists.txt
-
tools/cpm/cmake/package/version.cmake
|
|
|
@ -1,13 +0,0 @@ |
|
|
|
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();
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -417,12 +417,9 @@ AddJsonPackage(boost) |
|
|
|
set(BOOST_NO_HEADERS ${Boost_ADDED}) |
|
|
|
|
|
|
|
if (Boost_ADDED) |
|
|
|
if (MSVC OR ANDROID) |
|
|
|
add_compile_definitions(YUZU_BOOST_v1) |
|
|
|
endif() |
|
|
|
|
|
|
|
add_compile_definitions(YUZU_BOOST_v1) |
|
|
|
if (NOT MSVC OR CXX_CLANG) |
|
|
|
# boost sucks |
|
|
|
# solaris sucks |
|
|
|
if (PLATFORM_SUN) |
|
|
|
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-pthreads>) |
|
|
|
endif() |
|
|
|
@ -431,8 +428,7 @@ if (Boost_ADDED) |
|
|
|
target_compile_options(boost_icl INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>) |
|
|
|
target_compile_options(boost_asio INTERFACE |
|
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion> |
|
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough> |
|
|
|
) |
|
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
@ -6,22 +6,19 @@ |
|
|
|
"version": "v0.19.0" |
|
|
|
}, |
|
|
|
"boost": { |
|
|
|
"artifact": "%VERSION%-cmake.tar.xz", |
|
|
|
"artifact": "boost-%VERSION%.tar.zst", |
|
|
|
"find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem", |
|
|
|
"hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d", |
|
|
|
"hash": "077ad58b3d336041c05ad5f2b1de7db9fe1d35af3da85cd99496c35ddeca080ecd0ae5c8058319077bda892361b38624d89f70bc9bfec6713aae2aabc17f2a43", |
|
|
|
"min_version": "1.57", |
|
|
|
"package": "Boost", |
|
|
|
"patches": [ |
|
|
|
"0001-clang-cl.patch" |
|
|
|
], |
|
|
|
"repo": "boostorg/boost", |
|
|
|
"version": "boost-1.90.0" |
|
|
|
"repo": "eden-emulator/ext-boost", |
|
|
|
"version": "1.91.0-1" |
|
|
|
}, |
|
|
|
"boost_headers": { |
|
|
|
"bundled": true, |
|
|
|
"hash": "4ef845775e2277a8104ded6ddf749aa262ce52cf8438042869a048f9a0156dd772fbbcfa74efa1378fecef339b7286f6fe4b4feb5c45d49966b35d08e3e83507", |
|
|
|
"hash": "c5fa2cd72f6e6666b7963b97bc359c75284b8fb540c30f3629a028b85270c9bc66c8a051383964f2bd4c1e005a4691593d15696e7ef39ea87cf6cff9e5691fb2", |
|
|
|
"repo": "boostorg/headers", |
|
|
|
"version": "boost-1.90.0" |
|
|
|
"version": "boost-1.91.0" |
|
|
|
}, |
|
|
|
"catch2": { |
|
|
|
"hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35", |
|
|
|
|
|
|
|
@ -228,7 +228,7 @@ if(CXX_CLANG) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (BOOST_NO_HEADERS) |
|
|
|
target_link_libraries(common PUBLIC Boost::algorithm Boost::heap Boost::icl Boost::pool) |
|
|
|
target_link_libraries(common PUBLIC Boost::algorithm Boost::icl Boost::pool) |
|
|
|
else() |
|
|
|
target_link_libraries(common PUBLIC Boost::headers) |
|
|
|
endif() |
|
|
|
|
|
|
|
@ -65,7 +65,7 @@ else() |
|
|
|
endif() |
|
|
|
|
|
|
|
# update cached cpmfile content |
|
|
|
string(JSON cpmfile SET "${cpmfile}" "${key}" "${new_object}") |
|
|
|
string(JSON cpmfile SET "${cpmfile}" "${KEY}" "${new_object}") |
|
|
|
|
|
|
|
# write cached cpmfile |
|
|
|
get_cpmfile_path(file) |
|
|
|
|