diff options
author | Jiri Olsa <jolsa@kernel.org> | 2015-03-11 04:00:41 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-18 13:43:36 -0400 |
commit | 97e7a5153e8835c4cd03c77e258c1f556d8e9655 (patch) | |
tree | ab9f3afd611e90057c89d28e6533eddab907039a /tools/perf/config | |
parent | 235504dec113089856b39c65afb77a2f444aa2a9 (diff) |
perf build: Disable default check for libbabeltrace
Remove libbabeltrace check from default features set, because the
requested version is not released yet in most distributions. We'll
enable later.
Calling libbabeltrace check manually via feature_check before
$(feature-libbabeltrace) is used.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-5n7mr6ugcwdbxk0n1z8uukaa@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/config')
-rw-r--r-- | tools/perf/config/Makefile | 11 | ||||
-rw-r--r-- | tools/perf/config/feature-checks/Makefile | 2 | ||||
-rw-r--r-- | tools/perf/config/feature-checks/test-all.c | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index bd097187724b..b799649ab0e7 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -227,7 +227,6 @@ CORE_FEATURE_TESTS = \ | |||
227 | stackprotector-all \ | 227 | stackprotector-all \ |
228 | timerfd \ | 228 | timerfd \ |
229 | libdw-dwarf-unwind \ | 229 | libdw-dwarf-unwind \ |
230 | libbabeltrace \ | ||
231 | zlib | 230 | zlib |
232 | 231 | ||
233 | LIB_FEATURE_TESTS = \ | 232 | LIB_FEATURE_TESTS = \ |
@@ -243,7 +242,6 @@ LIB_FEATURE_TESTS = \ | |||
243 | libslang \ | 242 | libslang \ |
244 | libunwind \ | 243 | libunwind \ |
245 | libdw-dwarf-unwind \ | 244 | libdw-dwarf-unwind \ |
246 | libbabeltrace \ | ||
247 | zlib | 245 | zlib |
248 | 246 | ||
249 | VF_FEATURE_TESTS = \ | 247 | VF_FEATURE_TESTS = \ |
@@ -705,14 +703,15 @@ else | |||
705 | endif | 703 | endif |
706 | 704 | ||
707 | ifndef NO_LIBBABELTRACE | 705 | ifndef NO_LIBBABELTRACE |
708 | ifeq ($(feature-libbabeltrace), 0) | 706 | $(call feature_check,libbabeltrace) |
709 | msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev); | 707 | ifeq ($(feature-libbabeltrace), 1) |
710 | NO_LIBBABELTRACE := 1 | ||
711 | else | ||
712 | CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS) | 708 | CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS) |
713 | LDFLAGS += $(LIBBABELTRACE_LDFLAGS) | 709 | LDFLAGS += $(LIBBABELTRACE_LDFLAGS) |
714 | EXTLIBS += -lbabeltrace-ctf | 710 | EXTLIBS += -lbabeltrace-ctf |
715 | $(call detected,CONFIG_LIBBABELTRACE) | 711 | $(call detected,CONFIG_LIBBABELTRACE) |
712 | else | ||
713 | msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev); | ||
714 | NO_LIBBABELTRACE := 1 | ||
716 | endif | 715 | endif |
717 | endif | 716 | endif |
718 | 717 | ||
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index 8fe067864957..b6e2e312ba54 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile | |||
@@ -44,7 +44,7 @@ BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $(OUTPUT)$@ $(patsubst %.bin,%.c,$@) $( | |||
44 | ############################### | 44 | ############################### |
45 | 45 | ||
46 | test-all.bin: | 46 | test-all.bin: |
47 | $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -lbabeltrace | 47 | $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz |
48 | 48 | ||
49 | test-hello.bin: | 49 | test-hello.bin: |
50 | $(BUILD) | 50 | $(BUILD) |
diff --git a/tools/perf/config/feature-checks/test-all.c b/tools/perf/config/feature-checks/test-all.c index 1ffc3da5ca10..06f5c8a67cb2 100644 --- a/tools/perf/config/feature-checks/test-all.c +++ b/tools/perf/config/feature-checks/test-all.c | |||
@@ -101,9 +101,17 @@ | |||
101 | # include "test-pthread_attr_setaffinity_np.c" | 101 | # include "test-pthread_attr_setaffinity_np.c" |
102 | #undef main | 102 | #undef main |
103 | 103 | ||
104 | # if 0 | ||
105 | /* | ||
106 | * Disable libbabeltrace check for test-all, because the requested | ||
107 | * library version is not released yet in most distributions. Will | ||
108 | * reenable later. | ||
109 | */ | ||
110 | |||
104 | #define main main_test_libbabeltrace | 111 | #define main main_test_libbabeltrace |
105 | # include "test-libbabeltrace.c" | 112 | # include "test-libbabeltrace.c" |
106 | #undef main | 113 | #undef main |
114 | #endif | ||
107 | 115 | ||
108 | int main(int argc, char *argv[]) | 116 | int main(int argc, char *argv[]) |
109 | { | 117 | { |
@@ -130,7 +138,6 @@ int main(int argc, char *argv[]) | |||
130 | main_test_sync_compare_and_swap(argc, argv); | 138 | main_test_sync_compare_and_swap(argc, argv); |
131 | main_test_zlib(); | 139 | main_test_zlib(); |
132 | main_test_pthread_attr_setaffinity_np(); | 140 | main_test_pthread_attr_setaffinity_np(); |
133 | main_test_libbabeltrace(); | ||
134 | 141 | ||
135 | return 0; | 142 | return 0; |
136 | } | 143 | } |