diff options
author | Jiri Olsa <jolsa@redhat.com> | 2015-03-28 06:30:30 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-30 09:24:27 -0400 |
commit | 6ab2b762befd192b90704c5c7898f5abf8ebb387 (patch) | |
tree | ff2bf61342e6c339359825d3a5cb6225f74773ba /tools | |
parent | ccd41c86ad4d464d0ed4e48d80759ff85c2115b0 (diff) |
perf build: Disable libbabeltrace check by default
Disabling libbabeltrace check by default and replacing the
NO_LIBBABELTRACE make variable with LIBBABELTRACE.
Users wanting the libbabeltrace feature need to build via:
$ make LIBBABELTRACE=1
The reason for this is that the libababeltrace interface we use (version
1.3) hasn't been packaged/released yet, thus the failing feature check
only slows down build and confuses other (non CTF) developers.
Requested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jeremie Galarneau <jgalar@efficios.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20150328103030.GA8431@krava.redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Makefile.perf | 2 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index e9925e6ad1d0..c43a20517591 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -69,7 +69,7 @@ include config/utilities.mak | |||
69 | # | 69 | # |
70 | # Define NO_ZLIB if you do not want to support compressed kernel modules | 70 | # Define NO_ZLIB if you do not want to support compressed kernel modules |
71 | # | 71 | # |
72 | # Define NO_LIBBABELTRACE if you do not want libbabeltrace support | 72 | # Define LIBBABELTRACE if you DO want libbabeltrace support |
73 | # for CTF data format. | 73 | # for CTF data format. |
74 | # | 74 | # |
75 | # Define NO_LZMA if you do not want to support compressed (xz) kernel modules | 75 | # Define NO_LZMA if you do not want to support compressed (xz) kernel modules |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index cd121dfc4de9..59a98c643240 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -95,7 +95,7 @@ ifndef NO_LIBELF | |||
95 | FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw | 95 | FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw |
96 | endif | 96 | endif |
97 | 97 | ||
98 | ifndef NO_LIBBABELTRACE | 98 | ifdef LIBBABELTRACE |
99 | # for linking with debug library, run like: | 99 | # for linking with debug library, run like: |
100 | # make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/ | 100 | # make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/ |
101 | ifdef LIBBABELTRACE_DIR | 101 | ifdef LIBBABELTRACE_DIR |
@@ -598,7 +598,7 @@ else | |||
598 | NO_PERF_READ_VDSOX32 := 1 | 598 | NO_PERF_READ_VDSOX32 := 1 |
599 | endif | 599 | endif |
600 | 600 | ||
601 | ifndef NO_LIBBABELTRACE | 601 | ifdef LIBBABELTRACE |
602 | $(call feature_check,libbabeltrace) | 602 | $(call feature_check,libbabeltrace) |
603 | ifeq ($(feature-libbabeltrace), 1) | 603 | ifeq ($(feature-libbabeltrace), 1) |
604 | CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS) | 604 | CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS) |
@@ -607,7 +607,6 @@ ifndef NO_LIBBABELTRACE | |||
607 | $(call detected,CONFIG_LIBBABELTRACE) | 607 | $(call detected,CONFIG_LIBBABELTRACE) |
608 | else | 608 | else |
609 | msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev); | 609 | msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev); |
610 | NO_LIBBABELTRACE := 1 | ||
611 | endif | 610 | endif |
612 | endif | 611 | endif |
613 | 612 | ||