Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Jiri Olsa <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
tools/perf/config/Makefile | 6 +++---
tools/perf/config/feature-checks/Makefile | 4 ++++
tools/perf/config/feature-checks/test-libaudit.c | 7 +++++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 890f264..e82e0b8 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)))
@@ -240,7 +241,7 @@ ifneq ($(ARCH),x86)
endif
ifndef NO_LIBUNWIND
- ifeq ($(feature-libunwind), 1)
+ ifneq ($(feature-libunwind), 1)
msg := $(warning No libunwind found, disabling post unwind support. Please
install libunwind-dev[el] >= 0.99);
NO_LIBUNWIND := 1
endif
@@ -254,8 +255,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 d6d9570..8e49fa0 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 0000000..854a65d
--- /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();
+}
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
