[PATCHv2 14/14] tools build: Disable default check for libbabeltrace

Jiri Olsa
2015-03-04T10:40:50Z

On Tue, Mar 03, 2015 at 03:26:37PM +0100, Jiri Olsa wrote:
> 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>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
> Cc: David Ahern <david.ahern@oracle.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <peterz@infradead.org>

forgot to remove test-all.c::main's call for main_test_libbabeltrace,
v2 attached and perf/build branch updated..

thanks,
jirka

---
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>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
---
tools/build/Makefile.feature | 2 --
tools/build/feature/Makefile | 2 +-
tools/build/feature/test-all.c | 9 ++++++++-
tools/perf/config/Makefile | 9 +++++----
4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 7b587178efea..12e58703a364 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -50,7 +50,6 @@ FEATURE_TESTS ?= \
stackprotector-all \
timerfd \
libdw-dwarf-unwind \
- libbabeltrace \
zlib

FEATURE_DISPLAY ?= \
@@ -66,7 +65,6 @@ FEATURE_DISPLAY ?= \
libslang \
libunwind \
libdw-dwarf-unwind \
- libbabeltrace \
zlib

# Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index 8fe067864957..b6e2e312ba54 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -44,7 +44,7 @@ BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $(OUTPUT)$@ $(patsubst %.bin,%.c,$@) $(
###############################

test-all.bin:
- $(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
+ $(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

test-hello.bin:
$(BUILD)
diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
index 1ffc3da5ca10..06f5c8a67cb2 100644
--- a/tools/build/feature/test-all.c
+++ b/tools/build/feature/test-all.c
@@ -101,9 +101,17 @@
# include "test-pthread_attr_setaffinity_np.c"
#undef main

+# if 0
+/*
+ * Disable libbabeltrace check for test-all, because the requested
+ * library version is not released yet in most distributions. Will
+ * reenable later.
+ */
+
#define main main_test_libbabeltrace
# include "test-libbabeltrace.c"
#undef main
+#endif

int main(int argc, char *argv[])
{
@@ -130,7 +138,6 @@ int main(int argc, char *argv[])
main_test_sync_compare_and_swap(argc, argv);
main_test_zlib();
main_test_pthread_attr_setaffinity_np();
- main_test_libbabeltrace();

return 0;
}
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index df666a596c2a..480631eccf50 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -588,14 +588,15 @@ else
endif

ifndef NO_LIBBABELTRACE
- ifeq ($(feature-libbabeltrace), 0)
- msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev);
- NO_LIBBABELTRACE := 1
- else
+ $(call feature_check,libbabeltrace)
+ ifeq ($(feature-libbabeltrace), 1)
CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS)
LDFLAGS += $(LIBBABELTRACE_LDFLAGS)
EXTLIBS += -lbabeltrace-ctf
$(call detected,CONFIG_LIBBABELTRACE)
+ else
+ msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev);
+ NO_LIBBABELTRACE := 1
endif
endif

--
1.9.3