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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 225BCC4361B for ; Wed, 16 Dec 2020 22:52:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0E8A2370D for ; Wed, 16 Dec 2020 22:52:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730250AbgLPWwV (ORCPT ); Wed, 16 Dec 2020 17:52:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:53778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730242AbgLPWwV (ORCPT ); Wed, 16 Dec 2020 17:52:21 -0500 Received: from gandalf.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 720832370D for ; Wed, 16 Dec 2020 22:51:40 +0000 (UTC) Date: Wed, 16 Dec 2020 17:51:38 -0500 From: Steven Rostedt To: Linux Trace Devel Subject: [PATCH] trace-cmd: Do not have local builds of libtraceevent or libtracefs use system headers Message-ID: <20201216175138.2d1a9b34@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; 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)" If building locally, do not use system includes. This is needed for kernelshark v1 to build libtraceevent and libtracefs. If the system header files are used, there may be a mismatch with the frozen version of libtraceevent or libtracefs that kernelshark will use, and the system headers, and the build will fail. Signed-off-by: Steven Rostedt (VMware) --- lib/traceevent/Makefile | 4 ++++ lib/tracefs/Makefile | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/lib/traceevent/Makefile b/lib/traceevent/Makefile index 0dcd90c1..21ef5a4e 100644 --- a/lib/traceevent/Makefile +++ b/lib/traceevent/Makefile @@ -6,8 +6,12 @@ bdir:=$(obj)/lib/traceevent DEFAULT_TARGET = $(bdir)/libtraceevent.a +LIBTRACEEVENT_CFLAGS = -I$(src)/include/traceevent -I$(src)/lib/traceevent/include + CFLAGS += -I$(bdir)/include +CFLAGS := $(LIBTRACEEVENT_CFLAGS) $(CFLAGS) + OBJS = OBJS += event-parse.o OBJS += event-plugin.o diff --git a/lib/tracefs/Makefile b/lib/tracefs/Makefile index 021ae2b0..6f4370d9 100644 --- a/lib/tracefs/Makefile +++ b/lib/tracefs/Makefile @@ -6,8 +6,13 @@ bdir:=$(obj)/lib/tracefs DEFAULT_TARGET = $(bdir)/libtracefs.a +LIBTRACEEVENT_CFLAGS = -I$(src)/include/traceevent -I$(src)/lib/traceevent/include +LIBTRACEFS_CFLAGS = -I$(src)/include/tracefs -I$(src)/lib/tracefs/include + CFLAGS += -I$(bdir)/include +CFLAGS := $(LIBTRACEEVENT_CFLAGS) $(LIBTRACEFS_CFLAGS) $(CFLAGS) + OBJS = OBJS += tracefs-utils.o OBJS += tracefs-instance.o -- 2.25.4