From patchwork Wed Jan 22 17:22:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11346137 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1605D184C for ; Wed, 22 Jan 2020 17:24:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E90CB2465A for ; Wed, 22 Jan 2020 17:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729075AbgAVRYM (ORCPT ); Wed, 22 Jan 2020 12:24:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:54894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729078AbgAVRYM (ORCPT ); Wed, 22 Jan 2020 12:24:12 -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 C92A62465A for ; Wed, 22 Jan 2020 17:24:11 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.93) (envelope-from ) id 1iuJje-000hyY-OI for linux-trace-devel@vger.kernel.org; Wed, 22 Jan 2020 12:24:10 -0500 Message-Id: <20200122172410.631593595@goodmis.org> User-Agent: quilt/0.65 Date: Wed, 22 Jan 2020 12:22:51 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH v2 4/5] trace-cmd: Have libtracecmd.so include libtraceevent References: <20200122172247.539894616@goodmis.org> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" Was getting errors with loading libtracecmd.so with undefined symbols from libtraceevent. Add it to the build process to include what it uses as well. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 2 +- lib/trace-cmd/Makefile | 2 ++ scripts/utils.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c22aa7847b51..9c74268eddd5 100644 --- a/Makefile +++ b/Makefile @@ -301,7 +301,7 @@ $(LIBTRACEEVENT_STATIC): force $(obj)/lib/traceevent/plugins/trace_python_dir \ $(LIBTRACECMD_STATIC): force $(Q)$(MAKE) -C $(src)/lib/trace-cmd $@ -$(LIBTRACECMD_SHARED): force +$(LIBTRACECMD_SHARED): force $(LIBTRACEEVENT_SHARED) $(Q)$(MAKE) -C $(src)/lib/trace-cmd $@ libtraceevent.so: $(LIBTRACEEVENT_SHARED) diff --git a/lib/trace-cmd/Makefile b/lib/trace-cmd/Makefile index 6f3e6b1bf935..29c36ca195d0 100644 --- a/lib/trace-cmd/Makefile +++ b/lib/trace-cmd/Makefile @@ -35,6 +35,8 @@ $(DEPS): | $(bdir) $(bdir)/libtracecmd.a: $(OBJS) $(Q)$(call do_build_static_lib) +LIBS = -L$(obj)/lib/traceevent -ltraceevent + $(bdir)/libtracecmd.so: $(OBJS) $(Q)$(call do_compile_shared_library) diff --git a/scripts/utils.mk b/scripts/utils.mk index 8434aea7c24f..ccd4840f9364 100644 --- a/scripts/utils.mk +++ b/scripts/utils.mk @@ -61,7 +61,7 @@ do_build_static_lib = \ do_compile_shared_library = \ ($(print_shared_lib_compile) \ - $(CC) --shared $^ -Wl,-soname,$(@F) -o $@) + $(CC) --shared $^ $(LIBS) -Wl,-soname,$(@F) -o $@) do_compile_plugin_obj = \ ($(print_plugin_obj_compile) \