mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
	Robert Richter <robert.richter@linaro.org>,
	Robert Richter <rric@kernel.org>, Ingo Molnar <mingo@kernel.org>,
	Jiri Olsa <jolsa@redhat.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 03/23] perf tools: Fix build errors with O and DESTDIR make vars set
Date: Wed, 10 Jul 2013 16:19:03 -0300	[thread overview]
Message-ID: <1373483963-19277-4-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1373483963-19277-1-git-send-email-acme@infradead.org>

From: Robert Richter <robert.richter@linaro.org>

Fixing build errors with O and DESTDIR make vars set:

 $ make prefix=/usr/local O=$builddir DESTDIR=$destdir -C tools/ perf
 ...
 make[1]: Entering directory `.../.source/perf/tools/perf'
     CC .../.build/perf/perf/util/parse-events.o
 util/parse-events.c:14:32: fatal error: parse-events-bison.h: No such file or directory
 compilation terminated.
 make[1]: *** [.../.build/perf/perf/util/parse-events.o] Error 1
 ...

and:

     LINK /.../.build/perf/perf/perf
 gcc: error: /.../.build/perf/perf//.../.source/perf/tools/lib/lk/liblk.a: No such file or directory

Signed-off-by: Robert Richter <robert.richter@linaro.org>
Signed-off-by: Robert Richter <rric@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Robert Richter <rric@kernel.org>
Link: http://lkml.kernel.org/r/1370964158-4135-1-git-send-email-rric@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile        | 5 ++---
 tools/perf/config/Makefile | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 203cb0e..641fccd 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -121,17 +121,16 @@ SCRIPT_SH += perf-archive.sh
 grep-libs = $(filter -l%,$(1))
 strip-libs = $(filter-out -l%,$(1))
 
-LK_PATH=$(LK_DIR)
-
 ifneq ($(OUTPUT),)
   TE_PATH=$(OUTPUT)
 ifneq ($(subdir),)
-  LK_PATH=$(OUTPUT)$(LK_DIR)
+  LK_PATH=$(objtree)/lib/lk/
 else
   LK_PATH=$(OUTPUT)
 endif
 else
   TE_PATH=$(TRACE_EVENT_DIR)
+  LK_PATH=$(LK_DIR)
 endif
 
 LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index f139dcd..f446895 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -39,7 +39,7 @@ src-perf := $(srctree)/tools/perf
 endif
 
 ifeq ($(obj-perf),)
-obj-perf := $(objtree)
+obj-perf := $(OUTPUT)
 endif
 
 ifneq ($(obj-perf),)
-- 
1.8.1.4


  parent reply	other threads:[~2013-07-10 19:27 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1373483963-19277-1-git-send-email-acme@infradead.org>
2013-07-10 19:19 ` [PATCH 01/23] tools: Get only verbose output with V=1 Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 02/23] perf tools: Fix output directory of Documentation/ Arnaldo Carvalho de Melo
2013-07-10 19:19 ` Arnaldo Carvalho de Melo [this message]
2013-07-10 19:19 ` [PATCH 04/23] perf bench: Fix memory allocation fail check in mem{set,cpy} workloads Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 05/23] perf tools: Include termios.h explicitly Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 06/23] tools lib lk: Fix for cross build Arnaldo Carvalho de Melo
2013-07-11  0:34   ` Joonsoo Kim
2013-07-10 19:19 ` [PATCH 07/23] perf stat: Avoid sending SIGTERM to random processes Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 08/23] perf record: Remove -A/--append option Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 09/23] perf record: Remove -f/--force option Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 10/23] perf evlist: Enhance perf_evlist__start_workload() Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 11/23] perf tools: Fix -x/--exclude-other option for report command Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 12/23] perf tools: fix a typo of a Power7 event name Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 13/23] perf evsel: Fix count parameter to read call in event_format__new Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 14/23] perf tools: Fix parse_events_terms() segfault on error path Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 15/23] perf tools: Fix new_term() missing free " Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 16/23] perf tools: Update symbol_conf.nr_events when processing attribute events Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 17/23] perf evsel: Fix missing increment in sample parsing Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 18/23] perf symbols: Fix vdso list searching Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 19/23] perf stat: Fix per-socket output bug for uncore events Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 20/23] perf tools: Fix perf version generation Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 21/23] perf tools: Revert regression in configuration of Python support Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 22/23] perf tools: Fix -ldw/-lelf link test when static linking Arnaldo Carvalho de Melo
2013-07-10 19:19 ` [PATCH 23/23] perf script: Fix broken include in Context.xs Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373483963-19277-4-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=robert.richter@linaro.org \
    --cc=rric@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®