Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e7a515 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarIngo 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 235504de

tools/perf/config/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ CORE_FEATURE_TESTS = \ 
	stackprotector-all		\

	timerfd				\

	libdw-dwarf-unwind		\

	libbabeltrace			\

	zlib



LIB_FEATURE_TESTS =			\
@@ -243,7 +242,6 @@ LIB_FEATURE_TESTS = \ 
	libslang			\

	libunwind			\

	libdw-dwarf-unwind		\

	libbabeltrace			\

	zlib



VF_FEATURE_TESTS =			\
@@ -705,14 +703,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

tools/perf/config/feature-checks/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

tools/perf/config/feature-checks/test-all.c

+8 −1
Original line number Diff line number Diff line
@@ -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;

}