| From fc62f30fcbf4a1860b13269290282eb47778ea47 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 15 Nov 2019 11:36:10 +0000 |
| Subject: libtraceevent: Copy pkg-config file to output folder when using O= |
| |
| From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| |
| [ Upstream commit 15b3904f8e884e0d34d5f09906cf6526d0b889a2 ] |
| |
| 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: Sudipm Mukherjee <sudipm.mukherjee@gmail.com> |
| Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Cc: linux-trace-devel@vger.kernel.org |
| Link: http://lore.kernel.org/lkml/20191115113610.21493-2-sudipm.mukherjee@gmail.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 d008e64042ce..ecf882308d8a 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}; \ |
| -- |
| 2.20.1 |
| |
