* [PATCH] perf build: Do not fail on missing Build file
@ 2015-05-29 15:42 Jiri Olsa
2015-05-29 15:44 ` Arnaldo Carvalho de Melo
2015-05-29 18:38 ` [tip:perf/core] " tip-bot for Jiri Olsa
0 siblings, 2 replies; 3+ messages in thread
From: Jiri Olsa @ 2015-05-29 15:42 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Peter Zijlstra, Paul Mackerras, David Ahern, Namhyung Kim,
Ingo Molnar, Rabin Vincent
Allow nesting into directories without Build file. Currently we
force include of the Build file, which fails the build when the
Build file is missing.
We already support empty *-in.o' objects if there's nothing in
the directory to be compiled, so we can just use it for missing
Build file cases.
Also adding this case under tests.
Reported-by: Rabin Vincent <rabin.vincent@axis.com>
Link: http://lkml.kernel.org/n/tip-1pymrh6kezvfqdvkfdc1s4xx@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/build/Makefile.build | 2 +-
tools/build/tests/ex/Build | 1 +
tools/build/tests/ex/empty2/README | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 tools/build/tests/ex/empty2/README
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index 10df57237a66..69c35cf09cad 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -37,7 +37,7 @@ subdir-obj-y :=
# Build definitions
build-file := $(dir)/Build
-include $(build-file)
+-include $(build-file)
quiet_cmd_flex = FLEX $@
quiet_cmd_bison = BISON $@
diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build
index 0e6c3e6767e6..70d876237c57 100644
--- a/tools/build/tests/ex/Build
+++ b/tools/build/tests/ex/Build
@@ -2,6 +2,7 @@ ex-y += ex.o
ex-y += a.o
ex-y += b.o
ex-y += empty/
+ex-y += empty2/
libex-y += c.o
libex-y += d.o
diff --git a/tools/build/tests/ex/empty2/README b/tools/build/tests/ex/empty2/README
new file mode 100644
index 000000000000..2107cc5bf5a9
--- /dev/null
+++ b/tools/build/tests/ex/empty2/README
@@ -0,0 +1,2 @@
+This directory is left intentionally without Build file
+to test proper nesting into Build-less directories.
--
1.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf build: Do not fail on missing Build file
2015-05-29 15:42 [PATCH] perf build: Do not fail on missing Build file Jiri Olsa
@ 2015-05-29 15:44 ` Arnaldo Carvalho de Melo
2015-05-29 18:38 ` [tip:perf/core] " tip-bot for Jiri Olsa
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-05-29 15:44 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Peter Zijlstra, Paul Mackerras, David Ahern, Namhyung Kim,
Ingo Molnar, Rabin Vincent
Em Fri, May 29, 2015 at 05:42:58PM +0200, Jiri Olsa escreveu:
> Allow nesting into directories without Build file. Currently we
> force include of the Build file, which fails the build when the
> Build file is missing.
>
> We already support empty *-in.o' objects if there's nothing in
> the directory to be compiled, so we can just use it for missing
> Build file cases.
>
> Also adding this case under tests.
Thanks, applied.
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:perf/core] perf build: Do not fail on missing Build file
2015-05-29 15:42 [PATCH] perf build: Do not fail on missing Build file Jiri Olsa
2015-05-29 15:44 ` Arnaldo Carvalho de Melo
@ 2015-05-29 18:38 ` tip-bot for Jiri Olsa
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Jiri Olsa @ 2015-05-29 18:38 UTC (permalink / raw)
To: linux-tip-commits
Cc: dsahern, tglx, mingo, namhyung, paulus, a.p.zijlstra, acme,
linux-kernel, rabin.vincent, hpa, jolsa
Commit-ID: d7a3d85e08477a979933a2bb3b525a8de99543c2
Gitweb: http://git.kernel.org/tip/d7a3d85e08477a979933a2bb3b525a8de99543c2
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Fri, 29 May 2015 17:42:58 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 29 May 2015 12:44:25 -0300
perf build: Do not fail on missing Build file
Allow nesting into directories without Build file. Currently we force
include of the Build file, which fails the build when the Build file is
missing.
We already support empty *-in.o' objects if there's nothing in the
directory to be compiled, so we can just use it for missing Build file
cases.
Also adding this case under tests.
Reported-by: Rabin Vincent <rabin.vincent@axis.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rabin Vincent <rabin.vincent@axis.com>
Link: http://lkml.kernel.org/r/1432914178-24086-1-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/build/Makefile.build | 2 +-
tools/build/tests/ex/Build | 1 +
tools/build/tests/ex/empty2/README | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index 10df572..69c35cf 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -37,7 +37,7 @@ subdir-obj-y :=
# Build definitions
build-file := $(dir)/Build
-include $(build-file)
+-include $(build-file)
quiet_cmd_flex = FLEX $@
quiet_cmd_bison = BISON $@
diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build
index 0e6c3e6..70d8762 100644
--- a/tools/build/tests/ex/Build
+++ b/tools/build/tests/ex/Build
@@ -2,6 +2,7 @@ ex-y += ex.o
ex-y += a.o
ex-y += b.o
ex-y += empty/
+ex-y += empty2/
libex-y += c.o
libex-y += d.o
diff --git a/tools/build/tests/ex/empty2/README b/tools/build/tests/ex/empty2/README
new file mode 100644
index 0000000..2107cc5
--- /dev/null
+++ b/tools/build/tests/ex/empty2/README
@@ -0,0 +1,2 @@
+This directory is left intentionally without Build file
+to test proper nesting into Build-less directories.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-29 18:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-29 15:42 [PATCH] perf build: Do not fail on missing Build file Jiri Olsa
2015-05-29 15:44 ` Arnaldo Carvalho de Melo
2015-05-29 18:38 ` [tip:perf/core] " tip-bot for Jiri Olsa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.