Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ab2b762 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarIngo 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ccd41c86

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/perf/config/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -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