From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10A36C12002 for ; Sat, 17 Jul 2021 02:19:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAFF861154 for ; Sat, 17 Jul 2021 02:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232322AbhGQCWt (ORCPT ); Fri, 16 Jul 2021 22:22:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:40350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232184AbhGQCWs (ORCPT ); Fri, 16 Jul 2021 22:22:48 -0400 Received: from rorschach.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E3F1361154; Sat, 17 Jul 2021 02:19:52 +0000 (UTC) Date: Fri, 16 Jul 2021 22:19:51 -0400 From: Steven Rostedt To: Linux Trace Devel Cc: John 'Warthog9' Hawley Subject: [PATCH for v2.9 ] trace-cmd: For libtraceevent 1.3 have warning equal tep_warning Message-ID: <20210716221951.76b79bdf@rorschach.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" 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) --- 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