| From df15bbe2af8d40ae004410642cf07df677dabdff Mon Sep 17 00:00:00 2001 |
| From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| Date: Fri, 15 Nov 2019 11:36:09 +0000 |
| Subject: [PATCH] libtraceevent: Fix lib installation with O= |
| |
| commit 587db8ebdac2c5eb3a8851e16b26f2e2711ab797 upstream. |
| |
| 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: 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-1-sudipm.mukherjee@gmail.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile |
| index a39cdd0d890d..c1a6a5748fe4 100644 |
| --- a/tools/lib/traceevent/Makefile |
| +++ b/tools/lib/traceevent/Makefile |
| @@ -122,6 +122,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) |
| |
| -- |
| 2.7.4 |
| |