diff options
| author | Guilherme Amadio <amadio@gentoo.org> | 2024-06-06 17:33:02 +0200 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2024-06-22 01:19:12 +0200 |
| commit | 366e17409f1f17ad872259ce4a4f8a92beb4c4ee (patch) | |
| tree | 9a530457aa829da5deeca37b01824cfcbebc531f | |
| parent | perf build: Use pkg-config for feature check for libtrace{event,fs} (diff) | |
| download | linux-366e17409f1f17ad872259ce4a4f8a92beb4c4ee.tar.xz linux-366e17409f1f17ad872259ce4a4f8a92beb4c4ee.zip | |
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 <peter.volkov@gmail.com>
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
Reviewed-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240606153625.2255470-3-amadio@gentoo.org
| -rw-r--r-- | tools/perf/Makefile.config | 4 |
1 files 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))) |