[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 144/246] perf: Fix to obey LD failure on qemux86-64

[Emmanuele Bassi <ebassi src gnome org>]

commit c9f172aa5eebb649dccd07ec06fc269cfce09e33
Author: Christopher Larson <chris_larson mentor com>
Date:   Wed Sep 21 10:47:42 2016 +0530

    perf: Fix to obey LD failure on qemux86-64
    
    When built on an i686 host for qemux86-64 without the
    fix to obey LD and it fails:
    
    /scratch/dogwood/toolchains/x86_64/bin/i686-pc-linux-gnu-ld:
    Relocatable linking with relocations from format elf64-x86-64
    (/scratch/dogwood/perf-ld-test/build/tmp/work/qemux86_64-mel-linux/perf/1.0-r9/perf-1.0/fs/fs.o)
    to format elf32-i386 
(/scratch/dogwood/perf-ld-test/build/tmp/work/qemux86_64-mel-linux/perf/1.0-r9/perf-1.0/fs/libapi-in.o)
    is not supported
    
    This is because LD includes HOST_LD_ARCH, which contains TUNE_LDARGS,
    which is -m elf32_x86_64 for x86_64. Without that, direct use of ld will fail.
    
    (From OE-Core rev: 0ce06611068e74e6ea2e226e3f967aaa91fecd25)
    
    (From OE-Core rev: a98f6ed189f564bd1897308a893e294456c1666a)
    
    Signed-off-by: Christopher Larson <chris_larson mentor com>
    Signed-off-by: Sujith Haridasan <Sujith_Haridasan mentor com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-kernel/perf/perf.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 3d6ffb3..9c0d0f3 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -81,6 +81,7 @@ EXTRA_OEMAKE = '\
     ARCH=${ARCH} \
     CC="${CC}" \
     AR="${AR}" \
+    LD="${LD}" \
     EXTRA_CFLAGS="-ldw" \
     perfexecdir=${libexecdir} \
     NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \
@@ -101,7 +102,6 @@ EXTRA_OEMAKE += "\
     'infodir=${@os.path.relpath(infodir, prefix)}' \
 "
 
-
 do_compile() {
        # Linux kernel build system is expected to do the right thing
        unset CFLAGS
@@ -164,6 +164,7 @@ do_configure_prepend () {
     if [ -e "${S}/tools/lib/api/Makefile" ]; then
         sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile
         sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/lib/api/Makefile
     fi
     if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then
         sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile