Skip to contentSkip to conversation

trace-cmd: For libtraceevent 1.3 have warning equal tep_warning

PATCH New Steven Rostedt 1 participant 1 message Jul 17, 2021 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trace-cmd: For libtraceevent 1.3 have warning equal tep_warning

From: "Steven Rostedt (VMware)" <[email protected]>

In version libtracevent 1.3, warning() turned to tep_warning(), because "warning" was too generic. Although a compiled version of trace-cmd may still work because of the use of weak functions, building this version of trace-cmd may cause several warnings because warning is not declared.

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Makefile +5 -1
index 755db3f1..06cf5946 100644
@@ -241,7 +241,11 @@ TEST_LIBTRACEFS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEFS) > /dev/nul
 endif
 
 ifeq ("$(TEST_LIBTRACEEVENT)", "y")
-LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
+TRACEEVENT_V13 = $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.3 $(LIBTRACEEVENT) > /dev/null 2>&1 && echo y")
+ifeq ("$(TRACEEVENT_V13)", "y")
+   TEP_WARNING=-Dwarning=tep_warning
+endif
+LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)") $(TEP_WARNING)
 LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
 TRACEEVENT_PLUGINS =
 TRACEEVENT_PLUGINS_INSTALL =
Signature · 1 line
2.31.1