From patchwork Wed Dec 16 20:11:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978537 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=-13.8 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 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 8E609C4361B for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 441802368A for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727426AbgLPUMP (ORCPT ); Wed, 16 Dec 2020 15:12:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:35158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727409AbgLPUMP (ORCPT ); Wed, 16 Dec 2020 15:12:15 -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 1164D23600 for ; Wed, 16 Dec 2020 20:11:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd94-000vtZ-3g for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:34 -0500 Message-ID: <20201216201133.937274493@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:07 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 1/8] libtracefs: Clean up tracefs.h References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" Fix a typo, and use instead of "traceevent/event-parse.h" for the include name. Signed-off-by: Steven Rostedt (VMware) --- include/tracefs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tracefs.h b/include/tracefs.h index ce8b09ca5bd0..5cbe8982d1bc 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -6,8 +6,8 @@ #ifndef _TRACE_FS_H #define _TRACE_FS_H +#include #include -#include "traceevent/event-parse.h" char *tracefs_get_tracing_file(const char *name); void tracefs_put_tracing_file(char *name); @@ -18,7 +18,7 @@ const char *tracefs_get_tracing_dir(void); /* tracefs_find_tracing_dir must be freed */ char *tracefs_find_tracing_dir(void); -/* ftarce instances */ +/* ftrace instances */ struct tracefs_instance; void tracefs_instance_free(struct tracefs_instance *instance); From patchwork Wed Dec 16 20:11:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978539 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=-13.8 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 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 A6F1EC2BBCD for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 736E323770 for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727414AbgLPUMQ (ORCPT ); Wed, 16 Dec 2020 15:12:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:35170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727423AbgLPUMP (ORCPT ); Wed, 16 Dec 2020 15:12:15 -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 4E99C23609 for ; Wed, 16 Dec 2020 20:11:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd94-000vu3-BB for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:34 -0500 Message-ID: <20201216201134.148017704@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:08 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 2/8] libtracefs: Use $(objtree) instead of $(OUTPUT) for ld.so test References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" Use the variable $(objtree) to build the test program in the O=path directory, as there is no $(OUTPUT) variable defined. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a7d58081bf4b..f675d5e60db1 100644 --- a/Makefile +++ b/Makefile @@ -224,14 +224,14 @@ ifeq ("$(DESTDIR)", "") define install_ld_config $(LDCONFIG); \ if ! grep "^$(libdir)$$" $(LD_SO_CONF_PATH)/* &> /dev/null ; then \ - $(CC) -o $(OUTPUT)test $(srctree)/test.c -I $(includedir_SQ) \ + $(CC) -o $(objtree)/test $(srctree)/test.c -I $(includedir_SQ) \ -L $(libdir_SQ) -ltracefs &> /dev/null; \ - if ! $(OUTPUT)test &> /dev/null; then \ + if ! $(objtree)/test &> /dev/null; then \ $(call print_install, trace.conf, $(LD_SO_CONF_PATH)) \ echo $(libdir_SQ) >> $(LD_SO_CONF_PATH)/trace.conf; \ $(LDCONFIG); \ fi; \ - $(RM) $(OUTPUT)test; \ + $(RM) $(objtree)/test; \ fi endef else From patchwork Wed Dec 16 20:11:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978541 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=-13.8 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 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 B3DCCC2BBCA for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A71D23787 for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727423AbgLPUMQ (ORCPT ); Wed, 16 Dec 2020 15:12:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:35176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727425AbgLPUMP (ORCPT ); Wed, 16 Dec 2020 15:12:15 -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 7E21923619 for ; Wed, 16 Dec 2020 20:11:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd94-000vuX-Hg for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:34 -0500 Message-ID: <20201216201134.384206582@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:09 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 3/8] libtracefs: Do not hardcode location of libtraceevent References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" The Makefile has LIBS = -L$(obj)/lib/traceevent, which can be incorrect and should not be used. Remove it. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index f675d5e60db1..dec05e3e3a6a 100644 --- a/Makefile +++ b/Makefile @@ -312,8 +312,6 @@ all: $(DEFAULT_TARGET) $(bdir): @mkdir -p $(bdir) -LIBS = -L$(obj)/lib/traceevent -ltraceevent - $(LIBTRACEFS_STATIC): force $(Q)mkdir -p $(bdir) $(Q)$(MAKE) -C $(src)/src $@ From patchwork Wed Dec 16 20:11:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978543 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=-13.8 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 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 C9BC2C2BBCF for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A0AA3235F9 for ; Wed, 16 Dec 2020 20:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727425AbgLPUMQ (ORCPT ); Wed, 16 Dec 2020 15:12:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:35188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728558AbgLPUMQ (ORCPT ); Wed, 16 Dec 2020 15:12:16 -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 B03B02368A for ; Wed, 16 Dec 2020 20:11:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd94-000vv1-Nn for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:34 -0500 Message-ID: <20201216201134.586548693@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:10 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 4/8] libtracefs: Use $(obj) instead of $(OUTPUT) for libtracefs.pc file References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" The location of libtracefs.pc was incorrectly using $(OUTPUT) which does not even exist, where it should have been using $(obj) instead. Also need to move the variable declarations down below where $(obj) is defined. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dec05e3e3a6a..ab64ef3e4f54 100644 --- a/Makefile +++ b/Makefile @@ -61,9 +61,6 @@ includedir_SQ = '$(subst ','\'',$(includedir))' pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \ --variable pc_path pkg-config | tr ":" " ")) -PKG_CONFIG_SOURCE_FILE = libtracefs.pc -PKG_CONFIG_FILE := $(addprefix $(OUTPUT),$(PKG_CONFIG_SOURCE_FILE)) - LIBTRACEEVENT_INCLUDES = $(shell $(PKG_CONFIG) --cflags libtraceevent) LIBTRACEEVENT_LIBS = $(shell $(PKG_CONFIG) --libs libtraceevent) @@ -133,6 +130,9 @@ LIBTRACEFS_SHARED = $(bdir)/libtracefs.so.$(TRACEFS_VERSION) TRACE_LIBS = $(LIBTRACEEVENT_LIBS) +PKG_CONFIG_SOURCE_FILE = libtracefs.pc +PKG_CONFIG_FILE := $(addprefix $(obj)/,$(PKG_CONFIG_SOURCE_FILE)) + export LIBS TRACE_LIBS export LIBTRACEFS_STATIC LIBTRACEFS_SHARED From patchwork Wed Dec 16 20:11:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978551 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=-18.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 590DFC2BBCD for ; Wed, 16 Dec 2020 20:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 35FE6235F9 for ; Wed, 16 Dec 2020 20:13:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728689AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:35236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727430AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -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 ED33023715 for ; Wed, 16 Dec 2020 20:11:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd94-000vvV-UM for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:34 -0500 Message-ID: <20201216201134.772542934@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:11 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 5/8] libtracefs: Allow the pkg-config libs and cflags prefix to be overwritten References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" In case libtracecmd needs to be built in a destination directory where libtracefs will be located, and not on the host machine, it will need a way to override the location of the include and library directories. Facilitate this by having them use the ${prefix} variable. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 7 ++++--- libtracefs.pc.template | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ab64ef3e4f54..142b824ca421 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,8 @@ man_dir = $(prefix)/share/man man_dir_SQ = '$(subst ','\'',$(man_dir))' libdir = $(prefix)/$(libdir_relative) libdir_SQ = '$(subst ','\'',$(libdir))' -includedir = $(prefix)/include/tracefs +includedir_relative ?= include/tracefs +includedir = $(prefix)/$(includedir_relative) includedir_SQ = '$(subst ','\'',$(includedir))' pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \ --variable pc_path pkg-config | tr ":" " ")) @@ -193,8 +194,8 @@ define do_make_pkgconfig_file cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE}; \ sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; \ sed -i "s|LIB_VERSION|${TRACEFS_VERSION}|g" ${PKG_CONFIG_FILE}; \ - sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \ - sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; + sed -i "s|LIB_DIR|${libdir_relative}|g" ${PKG_CONFIG_FILE}; \ + sed -i "s|HEADER_DIR|$(includedir_relative)|g" ${PKG_CONFIG_FILE}; endef BUILD_PREFIX := $(BUILD_OUTPUT)/build_prefix diff --git a/libtracefs.pc.template b/libtracefs.pc.template index 5e7d54a4456c..a674fee24007 100644 --- a/libtracefs.pc.template +++ b/libtracefs.pc.template @@ -1,6 +1,6 @@ prefix=INSTALL_PREFIX -libdir=LIB_DIR -includedir=HEADER_DIR +libdir=${prefix}/LIB_DIR +includedir=${prefix}/HEADER_DIR Name: libtracefs URL: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/ From patchwork Wed Dec 16 20:11:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978545 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=-13.8 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 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 07C1EC4361B for ; Wed, 16 Dec 2020 20:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADAA423600 for ; Wed, 16 Dec 2020 20:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728692AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:35238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726964AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -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 173EB23719 for ; Wed, 16 Dec 2020 20:11:36 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd95-000vvz-3t for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:35 -0500 Message-ID: <20201216201134.980643943@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:12 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 6/8] libtracefs: Remove unneccessary TRACE_LIBS variable References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" The TRACE_LIBS variable in the Makefile is not not used anywhere. Simply have LIBS equal LIBTRACEEVENT_LIBS, and export LIBS instead. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 142b824ca421..a8b888958614 100644 --- a/Makefile +++ b/Makefile @@ -129,12 +129,12 @@ export prefix bindir src obj bdir LIBTRACEFS_STATIC = $(bdir)/libtracefs.a LIBTRACEFS_SHARED = $(bdir)/libtracefs.so.$(TRACEFS_VERSION) -TRACE_LIBS = $(LIBTRACEEVENT_LIBS) - PKG_CONFIG_SOURCE_FILE = libtracefs.pc PKG_CONFIG_FILE := $(addprefix $(obj)/,$(PKG_CONFIG_SOURCE_FILE)) -export LIBS TRACE_LIBS +LIBS = $(LIBTRACEEVENT_LIBS) + +export LIBS export LIBTRACEFS_STATIC LIBTRACEFS_SHARED export Q SILENT VERBOSE EXT From patchwork Wed Dec 16 20:11:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978549 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=-13.8 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 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 4BE47C0018C for ; Wed, 16 Dec 2020 20:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 106FC23719 for ; Wed, 16 Dec 2020 20:13:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728558AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:35242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -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 5457723730 for ; Wed, 16 Dec 2020 20:11:36 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd95-000vwT-BC for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 15:11:35 -0500 Message-ID: <20201216201135.151891625@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:13 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 7/8] libtracefs: Have only one definition of overriding CFLAGS References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" For some reason, there's two places CFLAGS gets overridden. There only needs to be one. Consolidate them. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a8b888958614..47ac4f5e8c8c 100644 --- a/Makefile +++ b/Makefile @@ -158,11 +158,8 @@ export CUNIT_INSTALLED export CFLAGS export INCLUDES -# Required CFLAGS -override CFLAGS += -D_GNU_SOURCE $(LIBTRACEEVENT_INCLUDES) - # Append required CFLAGS -override CFLAGS += $(INCLUDES) +override CFLAGS += -D_GNU_SOURCE $(LIBTRACEEVENT_INCLUDES) $(INCLUDES) all: all_cmd From patchwork Wed Dec 16 20:11:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978547 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=-13.8 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 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 24047C2BBCA for ; Wed, 16 Dec 2020 20:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D52B123619 for ; Wed, 16 Dec 2020 20:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:35240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728558AbgLPUM4 (ORCPT ); Wed, 16 Dec 2020 15:12:56 -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 80C5B23731; Wed, 16 Dec 2020 20:11:36 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpd95-000vwx-HD; Wed, 16 Dec 2020 15:11:35 -0500 Message-ID: <20201216201135.380840809@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:11:14 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Yordan Karadzhov Subject: [PATCH 8/8] libtracefs: Add -rpath to libtracefs.so References: <20201216201106.170659791@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" Pass in "-rpath=$ORIGIN" to the linker when building libtracefs.so, such that the path for libtraceevent.so might be found if it is installed in the same location as libtracefs. Suggested-by: Yordan Karadzhov Signed-off-by: Steven Rostedt (VMware) --- scripts/utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils.mk b/scripts/utils.mk index 0d3c3194f6c5..7742e1981cef 100644 --- a/scripts/utils.mk +++ b/scripts/utils.mk @@ -56,7 +56,7 @@ do_build_static_lib = \ do_compile_shared_library = \ ($(print_shared_lib_compile) \ - $(CC) --shared $^ -Wl,-soname,$(@F) -o $@ $(LIBS)) + $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS)) do_compile_plugin_obj = \ ($(print_plugin_obj_compile) \