diff options
author | Ross Burton <ross@burtonini.com> | 2020-10-06 12:14:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-08 10:22:10 +0100 |
commit | 624262541605c476f5a0bd415b08d00379c15b00 (patch) | |
tree | 347a3e425a5859aa2dc1d31a6f72b8b5feaea98a | |
parent | a685e07a44f607d19fc9800d62ead9765e8a49bb (diff) | |
download | poky-624262541605c476f5a0bd415b08d00379c15b00.tar.gz |
boost: consolidate and update library list
Add some new libraries to the list (fiber, headers, type_erasure).
Move context/coroutine to the list instead of using overrides as it
builds everywhere I can test it.
Remove the mips16e override for wave as Boost fails so dramatically with
mips16e enabled that this isn't even close to a fix. Someone who cares
can fix this properly.
(From OE-Core rev: 092228f2df6869e31b157ea08766b3e94bee6e29)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 89df754744..cbf9cad707 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -14,11 +14,15 @@ BOOST_LIBS = "\ | |||
14 | atomic \ | 14 | atomic \ |
15 | chrono \ | 15 | chrono \ |
16 | container \ | 16 | container \ |
17 | context \ | ||
17 | contract \ | 18 | contract \ |
19 | coroutine \ | ||
18 | date_time \ | 20 | date_time \ |
19 | exception \ | 21 | exception \ |
22 | fiber \ | ||
20 | filesystem \ | 23 | filesystem \ |
21 | graph \ | 24 | graph \ |
25 | headers \ | ||
22 | iostreams \ | 26 | iostreams \ |
23 | log \ | 27 | log \ |
24 | math \ | 28 | math \ |
@@ -27,23 +31,13 @@ BOOST_LIBS = "\ | |||
27 | regex \ | 31 | regex \ |
28 | serialization \ | 32 | serialization \ |
29 | system \ | 33 | system \ |
30 | timer \ | ||
31 | test \ | 34 | test \ |
32 | thread \ | 35 | thread \ |
36 | timer \ | ||
37 | type_erasure \ | ||
33 | wave \ | 38 | wave \ |
34 | " | 39 | " |
35 | 40 | ||
36 | # only supported by x86 and powerpc | ||
37 | BOOST_LIBS_append_x86 = " context coroutine" | ||
38 | BOOST_LIBS_append_x86-64 = " context coroutine" | ||
39 | BOOST_LIBS_append_powerpc = " context coroutine" | ||
40 | BOOST_LIBS_append_arm = " context coroutine" | ||
41 | BOOST_LIBS_append_aarch64 = " context coroutine" | ||
42 | # need consistent settings for native builds (x86 override not applied for native) | ||
43 | BOOST_LIBS_remove_class-native = " context coroutine" | ||
44 | # does not compile | ||
45 | BOOST_LIBS_remove_mips16e = "wave" | ||
46 | |||
47 | # optional libraries | 41 | # optional libraries |
48 | PACKAGECONFIG ??= "locale python" | 42 | PACKAGECONFIG ??= "locale python" |
49 | PACKAGECONFIG[locale] = ",,icu" | 43 | PACKAGECONFIG[locale] = ",,icu" |