lkml.org 
[lkml]   [2013]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] perf tools: Fix 'make tools/perf'
    On 12.07.13 10:39:09, Robert Richter wrote:

    > On 12.07.13 01:49:40, tip-bot for Robert Richter wrote:
    > > Commit-ID: 107de3724eff5a6fa6474a4d2aa5460b63749ebf
    > > Gitweb: http://git.kernel.org/tip/107de3724eff5a6fa6474a4d2aa5460b63749ebf
    > > Author: Robert Richter <robert.richter@linaro.org>
    > > AuthorDate: Tue, 11 Jun 2013 17:22:38 +0200
    > > Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    > > CommitDate: Mon, 8 Jul 2013 17:34:00 -0300
    > >
    > > perf tools: Fix build errors with O and DESTDIR make vars set

    > $ make tools/perf
    > LINK /home/robert/cx/linux/tools/perf/perf
    > gcc: error: ../linux/tools/lib/lk/liblk.a: No such file or directory

    Fix below.

    -Robert


    From ff89180092114191b1871eaa2b6f18d17124b21e Mon Sep 17 00:00:00 2001
    From: Robert Richter <robert.richter@linaro.org>
    Date: Tue, 16 Jul 2013 15:46:27 +0200
    Subject: [PATCH] perf tools: Fix 'make tools/perf'

    Boris just raised another variant of building perf tools which is
    broken:

    $ make tools/perf
    ...
    LINK /home/robert/cx/linux/tools/perf/perf
    gcc: error: ../linux/tools/lib/lk/liblk.a: No such file or directory

    The variant wasn't considered by:

    107de37 perf tools: Fix build errors with O and DESTDIR make vars set

    There are other variant of building perf too:

    $ make -C tools perf
    $ make -C tools/perf

    Plus variants with O= and DESTDIR set.

    This patch fixes the above and was tested with the following:

    $ make O=... DESTDIR=... tools/perf
    $ make O=... DESTDIR=... -C tools/ perf
    $ make O=... DESTDIR=... -C tools/perf
    $ make tools/perf
    $ make -C tools/ perf
    $ make -C tools/perf

    Reported-by: Borislav Petkov <bp@alien8.de>
    Signed-off-by: Robert Richter <robert.richter@linaro.org>
    Signed-off-by: Robert Richter <rric@kernel.org>
    ---
    tools/perf/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 641fccd..1d718a9 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -124,7 +124,7 @@ strip-libs = $(filter-out -l%,$(1))
    ifneq ($(OUTPUT),)
    TE_PATH=$(OUTPUT)
    ifneq ($(subdir),)
    - LK_PATH=$(objtree)/lib/lk/
    + LK_PATH=$(OUTPUT)/../lib/lk/
    else
    LK_PATH=$(OUTPUT)
    endif
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-07-16 17:43    [W:4.738 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site