summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
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:46 +0100
commit22cbd08cb1b8fd61d296d1c136e433d26d73dfd5 (patch)
treee849b27db3fa942bd89556e3ec135066af47e2e2 /meta/recipes-support
parent044d88895d98c9358d0fff33e714a0cb136bc7c4 (diff)
downloadpoky-22cbd08cb1b8fd61d296d1c136e433d26d73dfd5.tar.gz
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) Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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 = "\
33BOOST_LIBS_append_x86 = " context coroutine" 33BOOST_LIBS_append_x86 = " context coroutine"
34BOOST_LIBS_append_x86-64 = " context coroutine" 34BOOST_LIBS_append_x86-64 = " context coroutine"
35BOOST_LIBS_append_powerpc = " context coroutine" 35BOOST_LIBS_append_powerpc = " context coroutine"
36BOOST_LIBS_append_arm = " context coroutine"
36# need consistent settings for native builds (x86 override not applied for native) 37# need consistent settings for native builds (x86 override not applied for native)
37BOOST_LIBS_remove_class-native = " context coroutine" 38BOOST_LIBS_remove_class-native = " context coroutine"
38# does not compile 39# does not compile
@@ -149,6 +150,9 @@ BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1'
149# Adjust the build for x32 150# Adjust the build for x32
150BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" 151BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64"
151 152
153# cross compiling for arm fails to detect abi, so provide some help
154BJAM_OPTS_append_arm = " abi=aapcs architecture=arm"
155
152do_configure() { 156do_configure() {
153 cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp 157 cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp
154 158