From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933191AbbCDKku (ORCPT ); Wed, 4 Mar 2015 05:40:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33308 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758514AbbCDKkq (ORCPT ); Wed, 4 Mar 2015 05:40:46 -0500 Date: Wed, 4 Mar 2015 11:40:08 +0100 From: Jiri Olsa To: Jiri Olsa Cc: linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCHv2 14/14] tools build: Disable default check for libbabeltrace Message-ID: <20150304104008.GA20659@krava.brq.redhat.com> References: <1425392797-22572-1-git-send-email-jolsa@kernel.org> <1425392797-22572-15-git-send-email-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1425392797-22572-15-git-send-email-jolsa@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Cc: Arnaldo Carvalho de Melo > Cc: Corey Ashford > Cc: David Ahern > Cc: Ingo Molnar > Cc: Namhyung Kim > Cc: Paul Mackerras > Cc: Peter Zijlstra 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 Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra --- 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