[gnome-continuous-yocto/gnomeostree-3.28-rocko: 66/218] boost: fix build with x32 and musl

[Emmanuele Bassi <ebassi src gnome org>]

commit adcf2b559cc5adc11b7ff8168de3c2706d9f4772
Author: Anuj Mittal <anuj mittal intel com>
Date:   Tue Jan 2 16:59:15 2018 +0800

    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>

 meta/recipes-support/boost/boost.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index f4ecc10..41fc90f 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 \
 BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1'
 
 # Adjust the build for x32
-BJAM_OPTS_append_linux-gnux32 = " abi=x32 address-model=64"
+BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64"
 
 do_configure() {
        cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp