tools build feature detection fixes
Arnaldo Carvalho de Melo
maintainercover tools build feature detection fixes
From: Arnaldo Carvalho de Melo <[email protected]>
Hi,
Some more work on auditing the feature detection fast path.
- Arnaldo
Arnaldo Carvalho de Melo (2):
tools build feature: Don't set feature-libslang-include-subdir=1 if test-all.c builds tools build: Test for presence of libtraceevent and libtracefs in test-all.c
tools/build/Makefile.feature | 1 - tools/build/feature/test-all.c | 10 ++++++++++ tools/perf/Makefile.config | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-)
Signature · 1 line
2.47.0
Arnaldo Carvalho de Melo
maintainerPATCH 1/2 tools build feature: Don't set feature-libslang-include-subdir=1 if test-all.c builds
From: Arnaldo Carvalho de Melo <[email protected]>
As it is not really included in tools/build/feature/test-all.c, so any questioning about this feature should really try to build tools/build/feature/test-libslang-include-subdir.c and not set it as detected when test-all.c builds.
--- tools/build/Makefile.feature | 1 - 1 file changed, 1 deletion(-)
tools/build/Makefile.feature +0 -1
@@ -82,7 +82,6 @@ FEATURE_TESTS_BASIC := \ libperl \ libpython \ libslang \ - libslang-include-subdir \ libtraceevent \ libtracefs \ libcpupower \
Signature · 1 line
2.47.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/2 tools build: Test for presence of libtraceevent and libtracefs in test-all.c
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
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.
--- tools/build/feature/test-all.c | 10 ++++++++++ tools/perf/Makefile.config | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-)
tools/build/feature/test-all.c +10 -0
@@ -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_liblibtraceevent (); +main_test_liblibtracefs ();return 0 ; }
tools/perf/Makefile.config +0 -2
@@ -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)
Signature · 1 line
2.47.0