lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] perf, tools: Fix lib/traceevent build dir with OUTPUT variable set
    Date
    With the OUTPUT variable set the libtraceevent.a file is wrongly built
    in the source directory:

    + make -d OUTPUT=/.../.build/perf-user/ DESTDIR=/.../.install/perf-user/
    ...
    Considering target file `../lib/traceevent//libtraceevent.a'.
    File `../lib/traceevent//libtraceevent.a' does not exist.
    Finished prerequisites of target file `../lib/traceevent//libtraceevent.a'.
    Must remake target `../lib/traceevent//libtraceevent.a'.
    Invoking recipe from Makefile:837 to update target `../lib/traceevent//libtraceevent.a'.
    Putting child 0x703850 (../lib/traceevent//libtraceevent.a) PID 8365 on the chain.
    Live child 0x703850 (../lib/traceevent//libtraceevent.a) PID 8365
    SUBDIR ../lib/traceevent/

    $ git clean -nxd
    Would remove tools/lib/traceevent/.event-parse.d
    Would remove tools/lib/traceevent/.parse-filter.d
    Would remove tools/lib/traceevent/.parse-utils.d
    Would remove tools/lib/traceevent/.trace-seq.d
    Would remove tools/lib/traceevent/event-parse.o
    Would remove tools/lib/traceevent/libtraceevent.a
    Would remove tools/lib/traceevent/parse-filter.o
    Would remove tools/lib/traceevent/parse-utils.o
    Would remove tools/lib/traceevent/trace-seq.o

    This patch fixes this.

    Note: Though this should already work with O=$outputdir we better use
    the OUTPUT variable directly.

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    ---
    tools/perf/Makefile | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 35655c3..2d4bf6e 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -186,10 +186,10 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))

    TRACE_EVENT_DIR = ../lib/traceevent/

    -ifeq ("$(origin O)", "command line")
    - TE_PATH=$(OUTPUT)/
    +ifneq ($(OUTPUT),)
    + TE_PATH=$(OUTPUT)
    else
    - TE_PATH=$(TRACE_EVENT_DIR)/
    + TE_PATH=$(TRACE_EVENT_DIR)
    endif

    LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
    @@ -842,7 +842,7 @@ $(LIB_FILE): $(LIB_OBJS)

    # libtraceevent.a
    $(LIBTRACEEVENT):
    - $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) $(COMMAND_O) libtraceevent.a
    + $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libtraceevent.a

    help:
    @echo 'Perf make targets:'
    --
    1.7.8.4



    \
     
     \ /
      Last update: 2012-08-07 20:41    [W:0.027 / U:0.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site