mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-04 12:18:08 -07:00
b2 silently skipped actually building cobalt (despite installing its headers) because we build boost with -std=c++17 globally, and cobalt needs c++20 with coroutines. Remove the requirement and inject the necessary flags into both build and tests, which now build & pass. Closes: https://bugs.gentoo.org/977237 Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1146 Signed-off-by: Sam James <sam@gentoo.org>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
Make sure cobalt gets actually built & installed correctly even when the
|
|
toplevel build is using std=c++17. Similar to the fix for msm.
|
|
https://bugs.gentoo.org/977237
|
|
|
|
--- a/libs/cobalt/build/Jamfile
|
|
+++ a/libs/cobalt/build/Jamfile
|
|
@@ -21,6 +21,7 @@ explicit
|
|
|
|
project : requirements
|
|
<define>BOOST_ASIO_NO_DEPRECATED
|
|
+ <toolset>gcc:<cxxflags>"-std=c++20 -fcoroutines"
|
|
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
|
|
<toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
|
|
<toolset>msvc:<cxxflags>/bigobj
|
|
@@ -57,9 +57,6 @@ lib boost_cobalt
|
|
: cobalt_sources
|
|
: requirements <define>BOOST_COBALT_SOURCE=1
|
|
<link>shared:<define>BOOST_COBALT_DYN_LINK=1
|
|
- [ requires
|
|
- cxx20_hdr_concepts
|
|
- ]
|
|
<boost.cobalt.pmr>boost-container:<library>/boost/container//boost_container
|
|
[ check-target-builds
|
|
$(config-binding:D)//cpp_lib_memory_resource
|
|
--- a/libs/cobalt/test/Jamfile.jam
|
|
+++ a/libs/cobalt/test/Jamfile.jam
|
|
@@ -10,6 +10,7 @@ import boost-cobalt ;
|
|
|
|
project : requirements
|
|
<define>BOOST_ASIO_NO_DEPRECATED
|
|
+ <toolset>gcc:<cxxflags>"-std=c++20 -fcoroutines"
|
|
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
|
|
<toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
|
|
<toolset>msvc:<cxxflags>/bigobj
|