From patchwork Wed Dec 16 20:19:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978555 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 3BBDFC2BBCA for ; Wed, 16 Dec 2020 20:20:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F389E236F9 for ; Wed, 16 Dec 2020 20:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727437AbgLPUUo (ORCPT ); Wed, 16 Dec 2020 15:20:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:37816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726877AbgLPUUo (ORCPT ); Wed, 16 Dec 2020 15:20:44 -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 2775B2360D; Wed, 16 Dec 2020 20:20:04 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpdHH-000w5O-49; Wed, 16 Dec 2020 15:20:03 -0500 Message-ID: <20201216202002.933559836@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:19:39 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Yordan Karadzhov Subject: [PATCH 1/2] libtracecmd: Add -rpath to libtracecmd.so References: <20201216201938.008772358@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 libtracecmd.so, such that the path for libtraceevent.so and libtracefs.so might be found if it is installed in the same location as libtracecmd. 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 c06888795ddf..8ac38cc983b1 100644 --- a/scripts/utils.mk +++ b/scripts/utils.mk @@ -64,7 +64,7 @@ do_build_static_lib = \ do_compile_shared_library = \ ($(print_shared_lib_compile) \ - $(CC) --shared $^ $(LIBS) -Wl,-soname,$(@F) -o $@) + $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS)) do_compile_plugin_obj = \ ($(print_plugin_obj_compile) \ From patchwork Wed Dec 16 20:19:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978557 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 5EA3AC0018C for ; Wed, 16 Dec 2020 20:20:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21ED12360D for ; Wed, 16 Dec 2020 20:20:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726877AbgLPUUo (ORCPT ); Wed, 16 Dec 2020 15:20:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:37828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727444AbgLPUUo (ORCPT ); Wed, 16 Dec 2020 15:20:44 -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 5A5832368A; Wed, 16 Dec 2020 20:20:04 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpdHH-000w5s-BW; Wed, 16 Dec 2020 15:20:03 -0500 Message-ID: <20201216202003.161014186@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 15:19:40 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Yordan Karadzhov Subject: [PATCH 2/2] trace-cmd: Add -rpath=$(libdir) for trace-cmd to find libtracecmd.so References: <20201216201938.008772358@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" Add a search path into the trace-cmd executable to find where libtracecmd.so exists, when it is executed. 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 8ac38cc983b1..03389126a11c 100644 --- a/scripts/utils.mk +++ b/scripts/utils.mk @@ -56,7 +56,7 @@ do_compile = \ do_app_build = \ ($(print_app_build) \ - $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS)) + $(CC) $^ -rdynamic -Wl,-rpath=$(libdir) -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS)) do_build_static_lib = \ ($(print_static_lib_build) \