* [PATCH for v2.9 ] trace-cmd: For libtraceevent 1.3 have warning equal tep_warning
@ 2021-07-17 2:19 Steven Rostedt
0 siblings, 0 replies; only message in thread
From: Steven Rostedt @ 2021-07-17 2:19 UTC (permalink / raw)
To: Linux Trace Devel; +Cc: John 'Warthog9' Hawley
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
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.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 755db3f1..06cf5946 100644
--- a/Makefile
+++ b/Makefile
@@ -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 =
--
2.31.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-17 2:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-17 2:19 [PATCH for v2.9 ] trace-cmd: For libtraceevent 1.3 have warning equal tep_warning Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).