From 055f0ce7d8345478aa029f9999a47efeef23fc05 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 13 Dec 2024 16:42:44 -0300 Subject: [PATCH] tools build: Test for presence of libtraceevent and libtracefs in test-all.c Since these are so far considered part of the basic set of libraries to be present when building perf, have then in tools/build/features/test-all.c. They were already in the FEATURE_TESTS_BASIC variable of tools/build/Makefile.feature, meaning if test-all.c builds, those features would be set as present, but then we were calling "again" (well, they were not in test-all.c, so were not really being tested) for it to be detected, fix this all up by not calling feature_check for those features but instead have them in test-all.c to be tested together with the the set of basic expected libraries. Cc: Adrian Hunter Cc: Ian Rogers Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/20241213195052.914914-3-acme@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/feature/test-all.c | 10 ++++++++++ tools/perf/Makefile.config | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c index 80ac297f8196..dfdbd486e350 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c @@ -166,6 +166,14 @@ # include "test-libzstd.c" #undef main +#define main main_test_libtraceevent +# include "test-libtraceevent.c" +#undef main + +#define main main_test_libtracefs +# include "test-libtracefs.c" +#undef main + int main(int argc, char *argv[]) { main_test_libpython(); @@ -203,6 +211,8 @@ int main(int argc, char *argv[]) main_test_reallocarray(); main_test_disassembler_four_args(); main_test_libzstd(); + main_test_libtraceevent(); + main_test_libtracefs(); return 0; } diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 0e4f6a860ae2..37b793b299fa 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -1187,7 +1187,6 @@ endif # libtraceevent is a recommended dependency picked up from the system. ifneq ($(NO_LIBTRACEEVENT),1) - $(call feature_check,libtraceevent) ifeq ($(feature-libtraceevent), 1) CFLAGS += -DHAVE_LIBTRACEEVENT $(shell $(PKG_CONFIG) --cflags libtraceevent) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libtraceevent) @@ -1203,7 +1202,6 @@ ifneq ($(NO_LIBTRACEEVENT),1) $(error ERROR: libtraceevent is missing. Please install libtraceevent-dev/libtraceevent-devel and/or set LIBTRACEEVENT_DIR or build with NO_LIBTRACEEVENT=1) endif - $(call feature_check,libtracefs) ifeq ($(feature-libtracefs), 1) CFLAGS += $(shell $(PKG_CONFIG) --cflags libtracefs) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libtracefs) -- 2.50.1