Commit e5e992a7 authored Apr 12, 2017 by David Carrillo-Cisneros Committed by Arnaldo Carvalho de Melo Apr 13, 2017

perf tools: Disable JVMTI if no ELF support available



The build of JVMTI depends on LIBELF (-lelf). Make Makefile.conf
check this dependendancy and notify user when not present.

v2: Comma nitpicking.

Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Tested-by: Kim Phillips <kim.phillips@arm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170412170745.26620-1-davidcc@google.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 739cf305

tools/perf/Makefile.config

+3 −1

Original line number	Diff line number	Diff line
		@@ -274,6 +274,7 @@ ifdef NO_LIBELF
		NO_LIBUNWIND := 1
		NO_LIBDW_DWARF_UNWIND := 1
		NO_LIBBPF := 1
		NO_JVMTI := 1
		else
		ifeq ($(feature-libelf), 0)
		ifeq ($(feature-glibc), 1)
		@@ -283,7 +284,7 @@ else
		LIBC_SUPPORT := 1
		endif
		ifeq ($(LIBC_SUPPORT),1)
		msg := $(warning No libelf found, disables 'probe' tool and BPF support in 'perf record', please install libelf-dev, libelf-devel or elfutils-libelf-devel);
		msg := $(warning No libelf found. Disables 'probe' tool, jvmti and BPF support in 'perf record'. Please install libelf-dev, libelf-devel or elfutils-libelf-devel);

		NO_LIBELF := 1
		NO_DWARF := 1
		@@ -291,6 +292,7 @@ else
		NO_LIBUNWIND := 1
		NO_LIBDW_DWARF_UNWIND := 1
		NO_LIBBPF := 1
		NO_JVMTI := 1
		else
		ifneq ($(filter s% -static%,$(LDFLAGS),),)
		msg := $(error No static glibc found, please install glibc-static);

Admin message