From 57acb4680f999e0b2ab96e87fa5313defddeb577 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Fri, 16 Oct 2020 14:42:00 -0700 Subject: Move context and coroutine Yocto upstream moved context and coroutine directly into BOOST_LIBS, which means that they're not added back for our arm variant. https://github.com/lgirdk/poky/commit/624262541605c476f5a0bd415b08d00379c15b00 This causes our build to fail with "cannot find -lboost_coroutine" errors. This should resolve it. Tested: Fixing CI break. No functional testing done. (From meta-phosphor rev: 6be1787fdc13405fa9daa6755c28534bbcaa7458) Signed-off-by: Ed Tanous Change-Id: I60d7bb8ea25a08bfdb399f8addfaf560fd7a7b7c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-support/boost/boost_%.bbappend | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'meta-phosphor/recipes-support/boost/boost_%.bbappend') diff --git a/meta-phosphor/recipes-support/boost/boost_%.bbappend b/meta-phosphor/recipes-support/boost/boost_%.bbappend index b614346aff..fabb7f55e9 100644 --- a/meta-phosphor/recipes-support/boost/boost_%.bbappend +++ b/meta-phosphor/recipes-support/boost/boost_%.bbappend @@ -1,12 +1,10 @@ #This is largely to improve our build times by not building or installing -#modules that OpenBMC does not use by our coding standard. Another thing to -#note is that for most targets, coroutine and context libraries are also added -#with a BOOST_LIBS_append_ for most targets. Chrono/Thread should not -#be relied directly, but are required dependencies of context and coroutine. -#See the relevant portion of the openbmc coding standard with regards to boost -#libraries +#modules that OpenBMC does not use by our coding standard. Chrono and Thread +#should not be relied directly, but are required dependencies of context and +#coroutine at build time. See the relevant portion of the openbmc coding +#standard with regards to boost libraries # #https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#boost # -#BOOST_LIBS_openbmc-phosphor = "chrono thread" +BOOST_LIBS_openbmc-phosphor = "chrono context coroutine thread" -- cgit v1.2.3