From patchwork Mon Dec 14 21:08:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11973117 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 2D7C1C4361B for ; Mon, 14 Dec 2020 21:09:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1B05224B0 for ; Mon, 14 Dec 2020 21:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503658AbgLNVJU (ORCPT ); Mon, 14 Dec 2020 16:09:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:40714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503646AbgLNVJR (ORCPT ); Mon, 14 Dec 2020 16:09:17 -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 90E012255F for ; Mon, 14 Dec 2020 21:08:36 +0000 (UTC) Date: Mon, 14 Dec 2020 16:08:34 -0500 From: Steven Rostedt To: Linux Trace Devel Subject: [PATCH] libtraceevent: Add trace.conf for ld.so if needed Message-ID: <20201214160834.7a49534a@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" It can not be guaranteed that the system the library is being installed on has ld.so set to search the location of where libtraceevent.so is installed. During the install process, check if the path is found in ld.so.conf.d/ and if not, test if an executable can be built and find the library. If it can not, then add the path to ld.so.conf.d/trace.conf, and run ldconfig again. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 29 ++++++++++++++++++++++++++++- test.c | 7 +++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 test.c diff --git a/Makefile b/Makefile index 9044536..9937b33 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,8 @@ $(call allow-override,CC,$(CROSS_COMPILE)gcc) $(call allow-override,AR,$(CROSS_COMPILE)ar) $(call allow-override,NM,$(CROSS_COMPILE)nm) $(call allow-override,PKG_CONFIG,pkg-config) +$(call allow-override,LD_SO_CONF_PATH,/etc/ld.so.conf.d/) +$(call allow-override,LDCONFIG,ldconfig) EXT = -std=gnu99 INSTALL = install @@ -241,10 +243,35 @@ define do_install_pkgconfig_file fi endef + +ifeq ("$(DESTDIR)", "") +# If DESTDIR is not defined, then test if after installing the library +# and running ldconfig, if the library is visible by ld.so. +# If not, add the path to /etc/ld.so.conf.d/trace.conf and run ldconfig again. +define install_ld_config + $(LDCONFIG); \ + if ! grep "^$(libdir_SQ)$$" $(LD_SO_CONF_PATH)/* &> /dev/null ; then \ + $(CC) -o $(OUTPUT)test $(srctree)/test.c -I $(includedir_SQ) \ + -L $(libdir_SQ) -ltraceevent; \ + if ! $(OUTPUT)test > /dev/null; then \ + echo '$(libdir_SQ)' >> $(LD_SO_CONF_PATH)/trace.conf; \ + $(LDCONFIG); \ + fi; \ + $(RM) $(OUTPUT)test; \ + fi +endef +else +# If installing to a location for another machine or package, do not bother +# with running ldconfig. +define install_ld_config +endef +endif # DESTDIR = "" + install_lib: all_cmd install_plugins install_headers install_pkgconfig $(call QUIET_INSTALL, $(LIB_TARGET)) \ $(call do_install_mkdir,$(libdir_SQ)); \ - cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) + cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ); \ + $(call install_ld_config) install_pkgconfig: $(PKG_CONFIG_FILE) $(call QUIET_INSTALL, $(PKG_CONFIG_FILE)) \ diff --git a/test.c b/test.c new file mode 100644 index 0000000..7566fac --- /dev/null +++ b/test.c @@ -0,0 +1,7 @@ +#include + +int main () +{ + tep_load_plugins(NULL); + return 0; +}