summaryrefslogtreecommitdiffstats
path: root/poky
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2018-09-25 14:17:59 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-09-26 13:29:54 -0400
commit0d70daf3145fa62a529ae2fadb0e6d7d89674673 (patch)
treef21e9c678f119c3551b42675ca6a976ed951ca06 /poky
parent6c09f7a1614f67835e46c088cd2061e41d1e1903 (diff)
downloadtalos-openbmc-0d70daf3145fa62a529ae2fadb0e6d7d89674673.tar.gz
talos-openbmc-0d70daf3145fa62a529ae2fadb0e6d7d89674673.zip
boost: build context and coroutine for arm
When cross-compiling for arm architecture, bjam fails to properly detect the abi, which causes a failed conditional to omit the assembly code that supports the platform. (From OE-Core rev: 920f2c479c3cf30d92f79dc9098e5915c05cc5e1) (From poky rev: 22cbd08cb1b8fd61d296d1c136e433d26d73dfd5) Change-Id: Icd329c5cec2fe5597c61d4e4d4d6820d5abc7d79 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky')
-rw-r--r--poky/meta/recipes-support/boost/boost.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc
index 0461ec6fc..0ff5b7a77 100644
--- a/poky/meta/recipes-support/boost/boost.inc
+++ b/poky/meta/recipes-support/boost/boost.inc
@@ -32,6 +32,7 @@ BOOST_LIBS = "\
BOOST_LIBS_append_x86 = " context coroutine"
BOOST_LIBS_append_x86-64 = " context coroutine"
BOOST_LIBS_append_powerpc = " context coroutine"
+BOOST_LIBS_append_arm = " context coroutine"
# need consistent settings for native builds (x86 override not applied for native)
BOOST_LIBS_remove_class-native = " context coroutine"
# does not compile
@@ -149,6 +150,9 @@ BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1'
# Adjust the build for x32
BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64"
+# cross compiling for arm fails to detect abi, so provide some help
+BJAM_OPTS_append_arm = " abi=aapcs architecture=arm"
+
do_configure() {
cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp
OpenPOWER on IntegriCloud