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

Commit 4d29089c authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Check libaudit availability for perf-trace builtin 



The newly added trace command requires an external audit library.

However it can cause a build error because it's not checked whether the
libaudit is installed on system:

    CC builtin-trace.o
  builtin-trace.c:7:22: fatal error: libaudit.h: No such file or directory
  compilation terminated.
  make: *** [builtin-trace.o] Error 1

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1348745018-21744-1-git-send-email-namhyung@kernel.org


[ committer note: Added ", disables 'trace tool' to the feature warning msg ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9ec60972

tools/perf/Makefile

+14 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ ifdef PARSER_DEBUG 
endif



CFLAGS = -fno-omit-frame-pointer -ggdb3 -funwind-tables -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) $(PARSER_DEBUG_CFLAGS)

EXTLIBS = -lpthread -lrt -lelf -lm -laudit

EXTLIBS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

ALL_LDFLAGS = $(LDFLAGS)

STRIP ?= strip
@@ -442,7 +442,6 @@ BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o 
BUILTIN_OBJS += $(OUTPUT)builtin-lock.o

BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o

BUILTIN_OBJS += $(OUTPUT)builtin-test.o

BUILTIN_OBJS += $(OUTPUT)builtin-trace.o

BUILTIN_OBJS += $(OUTPUT)builtin-inject.o



PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)
@@ -560,6 +559,19 @@ else 
	LIB_OBJS += $(OUTPUT)util/unwind.o

endif



ifdef NO_LIBAUDIT

	BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT

else

	FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit

	ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y)

		msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);

		BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT

	else

		BUILTIN_OBJS += $(OUTPUT)builtin-trace.o

		EXTLIBS += -laudit

	endif

endif



ifdef NO_NEWT

	BASIC_CFLAGS += -DNO_NEWT_SUPPORT

else

tools/perf/config/feature-tests.mak

+11 −0
Original line number Diff line number Diff line
@@ -193,3 +193,14 @@ int main(void) 
}

endef

endif



ifndef NO_LIBAUDIT

define SOURCE_LIBAUDIT

#include <libaudit.h>



int main(void)

{

	return audit_open();

}

endef

endif
 
 No newline at end of file

tools/perf/perf.c

+2 −0
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ static struct cmd_struct commands[] = { 
	{ "lock",	cmd_lock,	0 },

	{ "kvm",	cmd_kvm,	0 },

	{ "test",	cmd_test,	0 },

#ifndef NO_LIBAUDIT_SUPPORT

	{ "trace",	cmd_trace,	0 },

#endif

	{ "inject",	cmd_inject,	0 },

};