Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1278240
| From | Jiri Olsa <jolsa@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject |
| Date | 2015-11-26 15:00 +0100 |
| Message-ID | <qz5fB-5UD-27@gated-at.bofh.it> (permalink) |
| References | <qz5fB-5UD-21@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Using FEATURE-INCLUDE in bpf subproject in case bpf is built via perf. Keep the current features detection for other cases. Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-utuczk899ckz6qtggqvhm7yu@git.kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/lib/bpf/Makefile | 4 ++++ tools/perf/Makefile.perf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index a3caaf3eafbd..f0818f3b0d40 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -71,7 +71,11 @@ FEATURE_DISPLAY = libelf bpf INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(ARCH)/include/uapi -I$(srctree)/include/uapi FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES) +ifeq ($(FEATURES_INCLUDE),) include $(srctree)/tools/build/Makefile.feature +else +include $(FEATURES_INCLUDE) +endif export prefix libdir src obj diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 97badfa2a195..d2b20a1f4a21 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -431,7 +431,7 @@ $(LIBAPI)-clean: $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null $(LIBBPF): fixdep FORCE - $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a + $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a FEATURES_INCLUDE=$(realpath $(OUTPUT)FEATURE-INCLUDE) $(LIBBPF)-clean: $(call QUIET_CLEAN, libbpf) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 1/3] tools build: Introduce features dump include makefile Jiri Olsa <jolsa@kernel.org> - 2015-11-26 15:00 +0100
[PATCH 3/3] perf build: Fix traceevent plugins build race Jiri Olsa <jolsa@kernel.org> - 2015-11-26 15:00 +0100
Re: [PATCH 3/3] perf build: Fix traceevent plugins build race Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 17:40 +0100
[tip:perf/core] perf build: Fix traceevent plugins build race tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-11-27 08:50 +0100
[PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Jiri Olsa <jolsa@kernel.org> - 2015-11-26 15:00 +0100
Re: [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 17:40 +0100
Re: [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Jiri Olsa <jolsa@redhat.com> - 2015-11-26 19:20 +0100
Re: [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Jiri Olsa <jolsa@redhat.com> - 2015-11-26 19:20 +0100
[PATCH] tools build: Use fixdep with OUTPUT path prefix Jiri Olsa <jolsa@redhat.com> - 2015-11-26 20:00 +0100
Re: [PATCH] tools build: Use fixdep with OUTPUT path prefix Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 20:40 +0100
[tip:perf/core] tools build: Use fixdep with OUTPUT path prefix tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-11-27 08:50 +0100
Re: [PATCH 1/3] tools build: Introduce features dump include makefile Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 17:30 +0100
csiph-web