summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-09-30 14:55:31 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-09 08:48:40 +0200
commitd795a658eb0ab5ab0b86cda5abe28954b0a08471 (patch)
treecaeb6549959220a58f2d918a78a9b55e0651b69d
parent058f952de9b3075cd888dc3cea60691db0ec4d3f (diff)
downloadlinux-stable-d795a658eb0ab5ab0b86cda5abe28954b0a08471.tar.gz
linux-stable-d795a658eb0ab5ab0b86cda5abe28954b0a08471.tar.bz2
linux-stable-d795a658eb0ab5ab0b86cda5abe28954b0a08471.zip
tools/perf/build: Split out feature check: 'libaudit'
Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/n/tip-orhejqtjao3vf4wxwBUdzhaz@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--tools/perf/config/Makefile4
-rw-r--r--tools/perf/config/feature-checks/Makefile4
-rw-r--r--tools/perf/config/feature-checks/test-libaudit.c7
3 files changed, 13 insertions, 2 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index d684a292536e..d4f18f4c8d51 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -114,6 +114,7 @@ FEATURE_TESTS = \
libelf-mmap \
libelf-getphdrnum \
libunwind \
+ libaudit \
libnuma
$(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test)))
@@ -265,8 +266,7 @@ ifndef NO_LIBUNWIND
endif
ifndef NO_LIBAUDIT
- FLAGS_LIBAUDIT = $(CFLAGS) $(LDFLAGS) -laudit
- ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y)
+ ifneq ($(feature-libaudit), 1)
msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);
NO_LIBAUDIT := 1
else
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index d6d9570a038f..8e49fa0c922b 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -12,6 +12,7 @@ FILES= \
test-libelf-mmap \
test-libelf-getphdrnum \
test-libunwind \
+ test-libaudit \
test-libnuma
CC := $(CC) -MD
@@ -61,6 +62,9 @@ test-libnuma:
test-libunwind:
$(BUILD) -lunwind -lunwind-x86_64 -lelf
+test-libaudit:
+ $(BUILD) -laudit
+
-include *.d */*.d
###############################
diff --git a/tools/perf/config/feature-checks/test-libaudit.c b/tools/perf/config/feature-checks/test-libaudit.c
new file mode 100644
index 000000000000..854a65d3cc78
--- /dev/null
+++ b/tools/perf/config/feature-checks/test-libaudit.c
@@ -0,0 +1,7 @@
+#include <libaudit.h>
+
+int main(void)
+{
+ printf("error message: %s\n", audit_errno_to_name(0));
+ return audit_open();
+}