[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6903/8267] mkelfimage: Fix build on x86_64 with hardening



commit 37ec69301a602791b2a36b0d3d2b1cad59ca1426
Author: Khem Raj <raj khem gmail com>
Date:   Tue Jul 18 19:50:55 2017 -0700

    mkelfimage: Fix build on x86_64 with hardening
    
    We get linking errors on some hosts like
    | ld -static --warn-multiple-gp --warn-common -T linux-i386/convert.lds -o objdir/linux-i386/convert ob
    jdir/linux-i386/head.o objdir/linux-i386/convert_params.o
    | objdir/linux-i386/convert_params.o: In function `printf':
    | convert_params.c:(.text+0x1fd): undefined reference to `__stack_chk_fail_local'
    
    This is because the build system is defaulting to host linker when building
    32bit binaries and it may not have same defaults as OE toolchain and issue
    gets highlighted.
    
    fix it by using cross linker for 32bit links when building on x86_64
    
    (From OE-Core rev: 470c8a0fb5f51a626a194c8fd3aabd448b50ebfa)
    
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/mkelfimage/mkelfimage_git.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb 
b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
index 2bcc8d7..2ad4b49 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
+++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
@@ -29,6 +29,7 @@ CACHED_CONFIGUREVARS += "\
     HOST_CFLAGS='${BUILD_CFLAGS}' \
     HOST_CPPFLAGS='${BUILD_CPPFLAGS}' \
 "
+EXTRA_OECONF_append_x86-64 = " --with-i386=${HOST_SYS}"
 
 inherit autotools-brokensep
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]