From patchwork Fri Nov 15 11:36:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 11246125 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 E91BC930 for ; Fri, 15 Nov 2019 11:36:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA51F20730 for ; Fri, 15 Nov 2019 11:36:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gW3jOIAz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbfKOLgQ (ORCPT ); Fri, 15 Nov 2019 06:36:16 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38067 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726521AbfKOLgQ (ORCPT ); Fri, 15 Nov 2019 06:36:16 -0500 Received: by mail-wm1-f67.google.com with SMTP id z19so10047459wmk.3; Fri, 15 Nov 2019 03:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=IHg1oRX6A603aWd0opYOY7UZw/XHim2gNlaLlwMXeIo=; b=gW3jOIAz5nyQ7JdZRrxRLsV7X23+HTXqldOrvQLfJHfEIABYUA9OcspuTCaZ382V1o vAQVA6I7blvmHQiYwbXPQKPjY2+xcSeoR7zGECYWMCUME7J5ThSIq8jAP1AmVOfmfbHR /IVH0j6F62MWEeu4IyMohiQtIurvYMq10l8HqAlWr1e3B0KqgIQ4hqw8F0vxG+MvhnZw wkl7vBaA87Yxv2KB/iDqAFNIJoIE+n/Q4L3gzxmhYM9fiwrtlO0R0Y9t6BJXIlLOe9FP 6G48Cdqv7G9fzV4KmBLvoFkRLxGkrQ+nwRKDRPZe00TsP9MdxRg+nNpc/nHusR6Yl/WK inYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IHg1oRX6A603aWd0opYOY7UZw/XHim2gNlaLlwMXeIo=; b=YD0BbyEgYw2NAuWuXlXHirFjEXZNzlrtRxaiIORwxWOZD2sSkFMP/txNpKecuMBTrK 53zGApZhmSEd2GFVtZmBIBSUXsyCOoDBmPvyu2mgp+iE2RcMtraT935rZE+ii+c0qMcD T1EylHjzBuMRqNYQeuDlY1pURnVckLl8PkR5NJzTbCWkmE/gcunhoCIOVD9KkKABAyeP W4YinAHrRA6jbbWZSVk0ASVZQh69RUXyAl899hhi5AMKPH/BikMDVoSUI+MHn8AeP7vg emg8I5vMOIkMSITX9J9xle5oWCbnIuatToVRQYMGir1Gu6g28Wb8FQOoYtIm8pjEUTGK FoEw== X-Gm-Message-State: APjAAAVo9SJfBalAWWRu+KfOTL4YwMFpphg9Io38i4ZveGMix1c6VLGi NQ12NdVI89Xo8xELBv3bkOxka7IQ X-Google-Smtp-Source: APXvYqydVfwXnuP4aYL1C+O9FmkRDGBRwttFJ5vzv0ZUYlQdQ7g5NcNWDIVNUdZ6USUjtOiooYY5GA== X-Received: by 2002:a7b:c3ce:: with SMTP id t14mr13326083wmj.22.1573817774233; Fri, 15 Nov 2019 03:36:14 -0800 (PST) Received: from debian.office.codethink.co.uk ([167.98.27.226]) by smtp.gmail.com with ESMTPSA id 17sm8756962wmg.19.2019.11.15.03.36.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 03:36:13 -0800 (PST) From: Sudip Mukherjee To: arnaldo.melo@gmail.com, Arnaldo Carvalho de Melo , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-trace-devel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH 1/2] libtraceevent: fix lib installation Date: Fri, 15 Nov 2019 11:36:09 +0000 Message-Id: <20191115113610.21493-1-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org When we use 'O=' with make to build libtraceevent in a separate folder it fails to install libtraceevent.a and libtraceevent.so.1.1.0 with the error: INSTALL /home/sudip/linux/obj-trace/libtraceevent.a INSTALL /home/sudip/linux/obj-trace/libtraceevent.so.1.1.0 cp: cannot stat 'libtraceevent.a': No such file or directory Makefile:225: recipe for target 'install_lib' failed make: *** [install_lib] Error 1 I used the command: make O=../../../obj-trace DESTDIR=~/test prefix==/usr install It turns out libtraceevent Makefile, even though it builds in a separate folder, searches for libtraceevent.a and libtraceevent.so.1.1.0 in its source folder. So, add the 'OUTPUT' prefix to the source path so that 'make' looks for the files in the correct place. Signed-off-by: Sudip Mukherjee Reviewed-by: Steven Rostedt (VMware) --- tools/lib/traceevent/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index cbb429f55062..83446fe2cf01 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -97,6 +97,7 @@ EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION) LIB_TARGET = libtraceevent.a libtraceevent.so.$(EVENT_PARSE_VERSION) LIB_INSTALL = libtraceevent.a libtraceevent.so* +LIB_INSTALL := $(addprefix $(OUTPUT),$(LIB_INSTALL)) INCLUDES = -I. -I $(srctree)/tools/include $(CONFIG_INCLUDES) From patchwork Fri Nov 15 11:36:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 11246127 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 225A7930 for ; Fri, 15 Nov 2019 11:36:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0201420730 for ; Fri, 15 Nov 2019 11:36:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uxwEil4X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727306AbfKOLgS (ORCPT ); Fri, 15 Nov 2019 06:36:18 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52364 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726521AbfKOLgS (ORCPT ); Fri, 15 Nov 2019 06:36:18 -0500 Received: by mail-wm1-f66.google.com with SMTP id l1so9328714wme.2; Fri, 15 Nov 2019 03:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P28Puxylk/r5Ui/pcuWbRKPEVXZgWJIsu42I+gVjMAA=; b=uxwEil4XOgtsR611mBvNV24eDCf+ZMR75XGXhlmdoxVKrrHrKzIOQZXuvIQA2DYQBm Z0BL8dmY817HualEeGNxl8fxwna16Bq2eWlXqZtFXtzPSdpp+KMqDOMn7JSzH2OSe8Cw 4RlHqMORhUX4HF6QrI5GbhpKtLpKcDwd3IpFvNKfA5ZP3YFTiPB0BtmjrU8+i3Xb3/U+ RuuSIGzr5UqP/5bs6NTFGxdylOUku8ulIj4CvyzeQzYQJ2oUlAvcexOPztLGIbk8aOGu LTqWa0GRh7kVj2E/iOlkyxYp7eugewu/hTYuPUYD3x30HEXvByjebdZ49E4NeA1NVcG9 KrmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P28Puxylk/r5Ui/pcuWbRKPEVXZgWJIsu42I+gVjMAA=; b=MnVVRNhbr33s1UiH0DV+RoxP1m4MWamR6orFFvwVjQXF0NavvrirfnS7CliABn1HR8 q6UO1uvCJkubD3JjCTu6gvAkI6okdR/ij7DaRVJeuh2u1fI3PYWlnjM5Sq9JJwJ9Ww0Y EyjctBH62/2Yw9UkhruKAPzQOiNceWC0rpNlUeaJQQqUvT8LFhdSauYcneTNS2uo/AWY 3baHaRpgbejf3/Q+Sgwwu5YnRlTfZcORXQe3tKGOqIbbvyH21ChhurkmXNPhClH9xd10 GD4jHCtmaQS5G0/BCf2y0eOybc8bmEo/JRUT4YTqtmzdqEXQ7U2NoPU0zs07IRyrZdH1 SouQ== X-Gm-Message-State: APjAAAVC/ALKDrNuWmv39MAEPQ8vrEbx/kJd4O+qLQW8XNrkDy+zAxCm nPq88E81jg7gfOn/4wULYj4= X-Google-Smtp-Source: APXvYqytQ0ArvpkUnnkzBMKfqvfntQkUvu0xqJVGXTGHxC1ysOjODO93KYidDgPryjlvD/bFsznqBQ== X-Received: by 2002:a1c:64d6:: with SMTP id y205mr12959002wmb.136.1573817775128; Fri, 15 Nov 2019 03:36:15 -0800 (PST) Received: from debian.office.codethink.co.uk ([167.98.27.226]) by smtp.gmail.com with ESMTPSA id 17sm8756962wmg.19.2019.11.15.03.36.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 03:36:14 -0800 (PST) From: Sudip Mukherjee To: arnaldo.melo@gmail.com, Arnaldo Carvalho de Melo , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-trace-devel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH 2/2] libtraceevent: copy pkg-config file in output folder Date: Fri, 15 Nov 2019 11:36:10 +0000 Message-Id: <20191115113610.21493-2-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191115113610.21493-1-sudipm.mukherjee@gmail.com> References: <20191115113610.21493-1-sudipm.mukherjee@gmail.com> Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org When we use 'O=' with make to build libtraceevent in a separate folder it still copies 'libtraceevent.pc' to its source folder. Modify the Makefile so that it uses the output folder to copy the pkg-config file and install from there. Signed-off-by: Sudip Mukherjee --- tools/lib/traceevent/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 83446fe2cf01..c5a03356a999 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -208,10 +208,11 @@ define do_install $(INSTALL) $(if $3,-m $3,) $1 '$(DESTDIR_SQ)$2' endef -PKG_CONFIG_FILE = libtraceevent.pc +PKG_CONFIG_SOURCE_FILE = libtraceevent.pc +PKG_CONFIG_FILE := $(addprefix $(OUTPUT),$(PKG_CONFIG_SOURCE_FILE)) define do_install_pkgconfig_file if [ -n "${pkgconfig_dir}" ]; then \ - cp -f ${PKG_CONFIG_FILE}.template ${PKG_CONFIG_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|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \ sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \