Messages in this thread Patch in this message | | | Date | Sat, 28 Mar 2015 11:30:30 +0100 | From | Jiri Olsa <> | Subject | [PATCH] perf build: Disable libbabeltrace check by default |
| |
On Sat, Mar 28, 2015 at 10:03:28AM +0100, Ingo Molnar wrote:
SNIP
> > > > I thought about this as of generic feature for all checks, but given > > that this is the only case so far, how about attached patch? > > > > it's changing the NO_LIBBABELTRACE to LIBBABELTRACE so the libbabeltrace > > check is disabled unless you do: > > > > $ make LIBBABELTRACE=1 > > > > and we'd switch it back once the babeltrace 1.3 is in generic use > > That sounds good to me! > > Acked-by: Ingo Molnar <mingo@kernel.org> > > Thanks, > > Ingo
attached same patch with full changelog
thanks, jirka
--- 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> Link: http://lkml.kernel.org/n/tip-1i0bqo6zi4p52utgj2ihfg1i@git.kernel.org --- tools/perf/Makefile.perf | 2 +- 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 # # Define NO_ZLIB if you do not want to support compressed kernel modules # -# Define NO_LIBBABELTRACE if you do not want libbabeltrace support +# Define LIBBABELTRACE if you DO want libbabeltrace support # for CTF data format. # # 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 FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw endif -ifndef NO_LIBBABELTRACE +ifdef LIBBABELTRACE # for linking with debug library, run like: # make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/ ifdef LIBBABELTRACE_DIR @@ -598,7 +598,7 @@ else NO_PERF_READ_VDSOX32 := 1 endif -ifndef NO_LIBBABELTRACE +ifdef LIBBABELTRACE $(call feature_check,libbabeltrace) ifeq ($(feature-libbabeltrace), 1) CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS) @@ -607,7 +607,6 @@ ifndef NO_LIBBABELTRACE $(call detected,CONFIG_LIBBABELTRACE) else msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev); - NO_LIBBABELTRACE := 1 endif endif -- 1.9.3
| |