[oe-commits] [openembedded-core] 02/04: perf: Fix to obey LD failure

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 122ae03e2f1a2252a6914d51087531557f9a08f2
Author: Sujith Haridasan <Sujith_Haridasan at mentor.com>
AuthorDate: Wed Oct 5 11:28:39 2016 +0530

    perf: Fix to obey LD failure
    
    This patch brings the last bit from meta-mentor for the perf
    to build successfully with minnowmax BSP. The meta-mentor
    commit for the same is:
    http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/commit/meta-mentor-staging?id=a8db95c0d4081cf96915e0c3c4063a44f55e21cc
    
    The previous fix:
    http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-kernel/perf?id=ef942d6025e1a339642b10ec1e29055f4ee6bd46
    was incomplete and was not submitted upstream. And due to that this change is required.
    
    When built on minnowmax ( machine name: intel-corei7-64),
    an error is noticed during the do_compile:
    
     /home/sujith/codebench-linux-install-2015.12-133-i686-pc-linux-gnu/codebench/bin/i686-pc-linux-gnu-ld:
    Relocatable linking with relocations from format elf64-x86-64
    (/home/sujith/MEL/dogwood/build-minnowmax/tmp/work/intel_corei7_64-mel-linux/perf/1.0-r9/perf-1.0/fd/array.o)
    to format elf32-i386 (/home/sujith/MEL/dogwood/build-minnowmax/tmp/work/intel_corei7_64-mel-linux/perf/1.0-r9/perf-1.0/fd/libapi-in.o)
    is not supported
    
    This change help fix the issue.
    
    Signed-off-by: Sujith Haridasan <Sujith_Haridasan at mentor.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 0d104d3..471023d 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -170,6 +170,7 @@ do_configure_prepend () {
     if [ -e "${S}/tools/perf/Makefile.perf" ]; then
         sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf
         sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/perf/Makefile.perf
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/perf/Makefile.perf
     fi
     if [ -e "${S}/tools/lib/api/Makefile" ]; then
         sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.