lkml.org 
[lkml]   [2019]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 71/79] libperf: Add install targets
Em Sun, Jul 21, 2019 at 01:24:58PM +0200, Jiri Olsa escreveu:
> Add install targets (mostly copied from lib/bpf),
> it's now possible to install libperf with:
>
> $ make DESTDIR=/tmp/krava install
> INSTALL libperf.a
> INSTALL libperf.so
> INSTALL libperf.so.0
> INSTALL libperf.so.0.0.1
> INSTALL headers
> INSTALL libperf.pc

'make install' shouldn't install the development parts, just what is
needed by an application dynamicly linking with libperf, right?

And I also noticed that it installs directl in /, i.e. one would have to
include '/usr' in the DESTDIR, which is different from libbpf:

[acme@quaco perf]$ rm -rf /tmp/C
[acme@quaco perf]$ make -C tools/lib/bpf DESTDIR=/tmp/C install
make: Entering directory '/home/acme/git/perf/tools/lib/bpf'
INSTALL libbpf.a
INSTALL libbpf.so.0.0.4
INSTALL libbpf.pc
make: Leaving directory '/home/acme/git/perf/tools/lib/bpf'
[acme@quaco perf]$
[acme@quaco perf]$ find /tmp/C
/tmp/C
/tmp/C/usr
/tmp/C/usr/local
/tmp/C/usr/local/lib64
/tmp/C/usr/local/lib64/pkgconfig
/tmp/C/usr/local/lib64/pkgconfig/libbpf.pc
/tmp/C/usr/local/lib64/libbpf.so.0.0.4
/tmp/C/usr/local/lib64/libbpf.so.0
/tmp/C/usr/local/lib64/libbpf.so
/tmp/C/usr/local/lib64/libbpf.a
[acme@quaco perf]$

I'm applying the patch as we can fix this later, but I think .a, .pc
files do not need to be installed for the main 'install' target, not
even libbpf should do it, do you see any reason why it should?

I.e. we should remove 'install_headers' from the main 'install' target,
I think.

- Arnaldo

> $ find /tmp/krava/
> /tmp/krava/
> /tmp/krava/include
> /tmp/krava/include/perf
> /tmp/krava/include/perf/evsel.h
> /tmp/krava/include/perf/evlist.h
> /tmp/krava/include/perf/threadmap.h
> /tmp/krava/include/perf/cpumap.h
> /tmp/krava/include/perf/core.h
> /tmp/krava/lib64
> /tmp/krava/lib64/pkgconfig
> /tmp/krava/lib64/pkgconfig/libperf.pc
> /tmp/krava/lib64/libperf.so.0.0.1
> /tmp/krava/lib64/libperf.so.0
> /tmp/krava/lib64/libperf.so
> /tmp/krava/lib64/libperf.a
>
> Link: http://lkml.kernel.org/n/tip-gz16baafdkv6irfkywache2i@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/lib/Makefile | 69 +++++++++++++++++++++++++++++-
> tools/perf/lib/libperf.pc.template | 11 +++++
> 2 files changed, 78 insertions(+), 2 deletions(-)
> create mode 100644 tools/perf/lib/libperf.pc.template
>
> diff --git a/tools/perf/lib/Makefile b/tools/perf/lib/Makefile
> index 25a6476f8b12..e69014a76971 100644
> --- a/tools/perf/lib/Makefile
> +++ b/tools/perf/lib/Makefile
> @@ -14,9 +14,31 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
> #$(info Determined 'srctree' to be $(srctree))
> endif
>
> +INSTALL = install
> +
> +# Use DESTDIR for installing into a different root directory.
> +# This is useful for building a package. The program will be
> +# installed in this directory as if it was the root directory.
> +# Then the build tool can move it later.
> +DESTDIR ?=
> +DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'
> +
> include $(srctree)/tools/scripts/Makefile.include
> include $(srctree)/tools/scripts/Makefile.arch
>
> +ifeq ($(LP64), 1)
> + libdir_relative = lib64
> +else
> + libdir_relative = lib
> +endif
> +
> +prefix ?=
> +libdir = $(prefix)/$(libdir_relative)
> +
> +# Shell quotes
> +libdir_SQ = $(subst ','\'',$(libdir))
> +libdir_relative_SQ = $(subst ','\'',$(libdir_relative))
> +
> ifeq ("$(origin V)", "command line")
> VERBOSE = $(V)
> endif
> @@ -49,6 +71,8 @@ override CFLAGS += -fvisibility=hidden
> all:
>
> export srctree OUTPUT CC LD CFLAGS V
> +export DESTDIR DESTDIR_SQ
> +
> include $(srctree)/tools/build/Makefile.include
>
> VERSION_SCRIPT := libperf.map
> @@ -60,6 +84,9 @@ VERSION = $(LIBPERF_VERSION).$(LIBPERF_PATCHLEVEL).$(LIBPERF_EXTRAVERSION)
> LIBPERF_SO := $(OUTPUT)libperf.so.$(VERSION)
> LIBPERF_A := $(OUTPUT)libperf.a
> LIBPERF_IN := $(OUTPUT)libperf-in.o
> +LIBPERF_PC := $(OUTPUT)libperf.pc
> +
> +LIBPERF_ALL := $(LIBPERF_A) $(OUTPUT)libperf.so*
>
> $(LIBPERF_IN): FORCE
> $(Q)$(MAKE) $(build)=libperf
> @@ -74,14 +101,52 @@ $(LIBPERF_SO): $(LIBPERF_IN)
> @ln -sf $(@F) $(OUTPUT)libperf.so.$(LIBPERF_VERSION)
>
>
> -libs: $(LIBPERF_A) $(LIBPERF_SO)
> +libs: $(LIBPERF_A) $(LIBPERF_SO) $(LIBPERF_PC)
>
> all: fixdep
> $(Q)$(MAKE) libs
>
> clean:
> $(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \
> - *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd LIBPERF-CFLAGS
> + *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd LIBPERF-CFLAGS $(LIBPERF_PC)
> +
> +$(LIBPERF_PC):
> + $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \
> + -e "s|@LIBDIR@|$(libdir_SQ)|" \
> + -e "s|@VERSION@|$(VERSION)|" \
> + < libperf.pc.template > $@
> +
> +define do_install_mkdir
> + if [ ! -d '$(DESTDIR_SQ)$1' ]; then \
> + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1'; \
> + fi
> +endef
> +
> +define do_install
> + if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
> + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
> + fi; \
> + $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
> +endef
> +
> +install_lib: libs
> + $(call QUIET_INSTALL, $(LIBPERF_ALL)) \
> + $(call do_install_mkdir,$(libdir_SQ)); \
> + cp -fpR $(LIBPERF_ALL) $(DESTDIR)$(libdir_SQ)
> +
> +install_headers:
> + $(call QUIET_INSTALL, headers) \
> + $(call do_install,include/perf/core.h,$(prefix)/include/perf,644); \
> + $(call do_install,include/perf/cpumap.h,$(prefix)/include/perf,644); \
> + $(call do_install,include/perf/threadmap.h,$(prefix)/include/perf,644); \
> + $(call do_install,include/perf/evlist.h,$(prefix)/include/perf,644); \
> + $(call do_install,include/perf/evsel.h,$(prefix)/include/perf,644);
> +
> +install_pkgconfig: $(LIBPERF_PC)
> + $(call QUIET_INSTALL, $(LIBPERF_PC)) \
> + $(call do_install,$(LIBPERF_PC),$(libdir_SQ)/pkgconfig,644)
> +
> +install: install_lib install_headers install_pkgconfig
>
> FORCE:
>
> diff --git a/tools/perf/lib/libperf.pc.template b/tools/perf/lib/libperf.pc.template
> new file mode 100644
> index 000000000000..117e4a237b55
> --- /dev/null
> +++ b/tools/perf/lib/libperf.pc.template
> @@ -0,0 +1,11 @@
> +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
> +
> +prefix=@PREFIX@
> +libdir=@LIBDIR@
> +includedir=${prefix}/include
> +
> +Name: libperf
> +Description: perf library
> +Version: @VERSION@
> +Libs: -L${libdir} -lperf
> +Cflags: -I${includedir}
> --
> 2.21.0

--

- Arnaldo

\
 
 \ /
  Last update: 2019-07-25 12:31    [W:0.343 / U:45.756 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site