summaryrefslogtreecommitdiffstats
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-03 09:26:37 +0000
commit56be88fcd45ef308bcc7b65254a625bd7a3511b1 (patch)
tree3b002d3977dc904cca087e486ae31b8e728de691
parent22f8f76aff3ebd85ad5e1b9c0ebb48303804861a (diff)
downloadpoky-56be88fcd45ef308bcc7b65254a625bd7a3511b1.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: 1879bd13f09c8180f737ddaccd2025e22c7f0c46) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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