24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
Ensure versions of libtraceevent and libtracefs have 3 components.
|
|
|
|
Fixes: https://bugs.gentoo.org/917559
|
|
|
|
--- a/tools/perf/Makefile.config
|
|
+++ b/tools/perf/Makefile.config
|
|
@@ -1163,7 +1163,7 @@ ifneq ($(NO_LIBTRACEEVENT),1)
|
|
ifeq ($(feature-libtraceevent), 1)
|
|
CFLAGS += -DHAVE_LIBTRACEEVENT
|
|
EXTLIBS += -ltraceevent
|
|
- LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent)
|
|
+ LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent).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)))
|
|
@@ -1177,7 +1177,7 @@ ifneq ($(NO_LIBTRACEEVENT),1)
|
|
$(call feature_check,libtracefs)
|
|
ifeq ($(feature-libtracefs), 1)
|
|
EXTLIBS += -ltracefs
|
|
- LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs)
|
|
+ LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs).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)))
|