* [GIT PULL 0/1] perf/urgent fix
@ 2010-08-18 22:18 Arnaldo Carvalho de Melo
2010-08-18 22:18 ` [PATCH 1/1] perf tools: Fix build error on read only source Arnaldo Carvalho de Melo
2010-08-19 10:25 ` [GIT PULL 0/1] perf/urgent fix Ingo Molnar
0 siblings, 2 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-08-18 22:18 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Bernd Petrovitsch,
Kusanagi Kouichi, Paul Mackerras, Peter Zijlstra
Hi Ingo,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
Or perhaps apply it directly, as git.kernel.org is taking ages to
sync with master today...
Regards,
- Arnaldo
Kusanagi Kouichi (1):
perf tools: Fix build error on read only source.
tools/perf/Makefile | 14 ++++++++++----
tools/perf/feature-tests.mak | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/1] perf tools: Fix build error on read only source.
2010-08-18 22:18 [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo
@ 2010-08-18 22:18 ` Arnaldo Carvalho de Melo
2010-08-19 10:25 ` [GIT PULL 0/1] perf/urgent fix Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-08-18 22:18 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Kusanagi Kouichi, Bernd Petrovitsch, Ingo Molnar,
Peter Zijlstra, Paul Mackerras, Arnaldo Carvalho de Melo
From: Kusanagi Kouichi <slash@ac.auone-net.jp>
Parts of the build process were generating files outside the specified
O= directory, causing the build to fail on systems where the sources are
in a read only file system.
Fix it by using $(OUTPUT) on these locations.
Also check that $(OUTPUT) actually exists, just like the top level
kernel Makefile does. Otherwise the failure message emitted is
completely misleading.
Cc: Bernd Petrovitsch <bernd@sysprog.at>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <20100817140841.0859362C03A@msa106.auone-net.jp>
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile | 14 ++++++++++----
tools/perf/feature-tests.mak | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index dcb9700..4f1fa77 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -5,6 +5,12 @@ endif
# The default target of this Makefile is...
all::
+ifneq ($(OUTPUT),)
+# check that the output directory actually exists
+OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
+$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
+endif
+
# Define V=1 to have a more verbose compile.
# Define V=2 to have an even more verbose compile.
#
@@ -931,15 +937,15 @@ $(OUTPUT)common-cmds.h: $(wildcard Documentation/perf-*.txt)
$(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
- $(QUIET_GEN)$(RM) $@ $@+ && \
+ $(QUIET_GEN)$(RM) $(OUTPUT)$@ $(OUTPUT)$@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
-e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
- $@.sh >$@+ && \
- chmod +x $@+ && \
- mv $@+ $(OUTPUT)$@
+ $@.sh > $(OUTPUT)$@+ && \
+ chmod +x $(OUTPUT)$@+ && \
+ mv $(OUTPUT)$@+ $(OUTPUT)$@
configure: configure.ac
$(QUIET_GEN)$(RM) $@ $<+ && \
diff --git a/tools/perf/feature-tests.mak b/tools/perf/feature-tests.mak
index ddb68e6..7a7b608 100644
--- a/tools/perf/feature-tests.mak
+++ b/tools/perf/feature-tests.mak
@@ -113,7 +113,7 @@ endef
# try-cc
# Usage: option = $(call try-cc, source-to-build, cc-options)
try-cc = $(shell sh -c \
- 'TMP="$(TMPOUT).$$$$"; \
+ 'TMP="$(OUTPUT)$(TMPOUT).$$$$"; \
echo "$(1)" | \
$(CC) -x c - $(2) -o "$$TMP" > /dev/null 2>&1 && echo y; \
rm -f "$$TMP"')
--
1.6.2.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL 0/1] perf/urgent fix
2010-08-18 22:18 [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo
2010-08-18 22:18 ` [PATCH 1/1] perf tools: Fix build error on read only source Arnaldo Carvalho de Melo
@ 2010-08-19 10:25 ` Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2010-08-19 10:25 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Bernd Petrovitsch, Kusanagi Kouichi,
Paul Mackerras, Peter Zijlstra, Steven Rostedt
* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:
> Hi Ingo,
>
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
>
> Or perhaps apply it directly, as git.kernel.org is taking ages to
> sync with master today...
>
> Regards,
>
> - Arnaldo
>
> Kusanagi Kouichi (1):
> perf tools: Fix build error on read only source.
>
> tools/perf/Makefile | 14 ++++++++++----
> tools/perf/feature-tests.mak | 2 +-
> 2 files changed, 11 insertions(+), 5 deletions(-)
Pulled, thanks Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-19 10:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-18 22:18 [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo
2010-08-18 22:18 ` [PATCH 1/1] perf tools: Fix build error on read only source Arnaldo Carvalho de Melo
2010-08-19 10:25 ` [GIT PULL 0/1] perf/urgent fix Ingo Molnar
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®