tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Guilherme Amadio and committed by
Namhyung Kim 366e1740 0f0e1f44

+2 -2
+2 -2
tools/perf/Makefile.config
··· 1179 1179 CFLAGS += -DHAVE_LIBTRACEEVENT 1180 1180 LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libtraceevent) 1181 1181 EXTLIBS += $(shell $(PKG_CONFIG) --libs-only-l libtraceevent) 1182 - LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent) 1182 + LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent).0.0 1183 1183 LIBTRACEEVENT_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEEVENT_VERSION))) 1184 1184 LIBTRACEEVENT_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEEVENT_VERSION))) 1185 1185 LIBTRACEEVENT_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEEVENT_VERSION))) ··· 1195 1195 CFLAGS += $(shell $(PKG_CONFIG) --cflags libtracefs) 1196 1196 LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libtracefs) 1197 1197 EXTLIBS += $(shell $(PKG_CONFIG) --libs-only-l libtracefs) 1198 - LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs) 1198 + LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs).0.0 1199 1199 LIBTRACEFS_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEFS_VERSION))) 1200 1200 LIBTRACEFS_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEFS_VERSION))) 1201 1201 LIBTRACEFS_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEFS_VERSION)))