summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-01-02 16:59:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:13:57 +0000
commitadcf2b559cc5adc11b7ff8168de3c2706d9f4772 (patch)
tree10d8f4b1a85d509e3f10d8d5d3e909c6d90c36d4 /meta
parent92e9b46f3ca316d18aa7de499a59c3d7f12c93d8 (diff)
downloadpoky-adcf2b559cc5adc11b7ff8168de3c2706d9f4772.tar.gz
boost: fix build with x32 and musl
Make sure that boost picks up correct address model value for x32 even when musl is enabled. Fixes [YOCTO #12119] Suggested-by: Ovidiu Panait <ovidiu.panait@windriver.com> (From OE-Core rev: 44257253e6b98c74c539edd2dee7fed3f856fa44) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1879bd13f09c8180f737ddaccd2025e22c7f0c46) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/boost/boost.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index f4ecc10a55..41fc90fb21 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -169,7 +169,7 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
169BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' 169BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1'
170 170
171# Adjust the build for x32 171# Adjust the build for x32
172BJAM_OPTS_append_linux-gnux32 = " abi=x32 address-model=64" 172BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64"
173 173
174do_configure() { 174do_configure() {
175 cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp 175 cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp