summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2018-09-25 14:17:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-26 15:13:39 +0100
commit920f2c479c3cf30d92f79dc9098e5915c05cc5e1 (patch)
tree87a2f49ae7d10b68c52c7969072ba505f1e89bb1
parent5fc7fbc10bbd3a54df16db275ecd6080bc58f19e (diff)
downloadopenembedded-core-contrib-920f2c479c3cf30d92f79dc9098e5915c05cc5e1.tar.gz
openembedded-core-contrib-920f2c479c3cf30d92f79dc9098e5915c05cc5e1.tar.bz2
openembedded-core-contrib-920f2c479c3cf30d92f79dc9098e5915c05cc5e1.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. Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 6984bee777..c4faea211f 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -33,6 +33,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