lkml.org 
[lkml]   [2017]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5/6] perf tools: disable JVMTI if no ELF support available
Em Wed, Apr 12, 2017 at 07:33:22PM +0200, Jiri Olsa escreveu:
> On Wed, Apr 12, 2017 at 10:07:45AM -0700, David Carrillo-Cisneros wrote:
> > The build of JVMTI depends on LIBELF (-lelf). Make Makefile.conf
> > check this dependendancy and notify user when not present.
> >
> > v2: Comma nitpicking.
>
> I think Arnaldo would change that.. but thanks! ;-)

But its so great that you guys offloaded that nitpicking part from me...
;-)

Thanks, applied, together with Kim's Tested-by.

- Arnaldo

> jirka
>
> >
> > Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
> > ---
> > tools/perf/Makefile.config | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> > index cfd6015229a2..279c303b2c22 100644
> > --- a/tools/perf/Makefile.config
> > +++ b/tools/perf/Makefile.config
> > @@ -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);
> > --
> > 2.12.2.715.g7642488e1d-goog
> >

\
 
 \ /
  Last update: 2017-04-13 16:48    [W:0.091 / U:0.216 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site