From 366e17409f1f17ad872259ce4a4f8a92beb4c4ee Mon Sep 17 00:00:00 2001 From: Guilherme Amadio Date: Thu, 6 Jun 2024 17:33:02 +0200 Subject: perf build: Ensure libtraceevent and libtracefs versions have 3 components When either of these have a shorter version, like 1.8, the expression that computes the version has a syntax error that can be seen in the output of make: expr: syntax error: missing argument after + Link: https://bugs.gentoo.org/917559 Reported-by: Peter Volkov Signed-off-by: Guilherme Amadio Reviewed-by: Leo Yan Signed-off-by: Namhyung Kim Link: https://lore.kernel.org/r/20240606153625.2255470-3-amadio@gentoo.org --- tools/perf/Makefile.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 54a6c6bf23c7..81f73f68d256 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -1179,7 +1179,7 @@ ifneq ($(NO_LIBTRACEEVENT),1) CFLAGS += -DHAVE_LIBTRACEEVENT LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libtraceevent) EXTLIBS += $(shell $(PKG_CONFIG) --libs-only-l libtraceevent) - LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent) + LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent).0.0 LIBTRACEEVENT_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEEVENT_VERSION))) LIBTRACEEVENT_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEEVENT_VERSION))) LIBTRACEEVENT_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEEVENT_VERSION))) @@ -1195,7 +1195,7 @@ ifneq ($(NO_LIBTRACEEVENT),1) CFLAGS += $(shell $(PKG_CONFIG) --cflags libtracefs) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libtracefs) EXTLIBS += $(shell $(PKG_CONFIG) --libs-only-l libtracefs) - LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs) + LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs).0.0 LIBTRACEFS_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEFS_VERSION))) LIBTRACEFS_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEFS_VERSION))) LIBTRACEFS_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEFS_VERSION))) -- cgit v1.2.3