From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
"Ingo Molnar" <mingo@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
"Michael Petlan" <mpetlan@redhat.com>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Alexei Starovoitov" <alexei.starovoitov@gmail.com>,
"Martin KaFai Lau" <kafai@fb.com>,
"Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>,
"Andrii Nakryiko" <andriin@fb.com>
Subject: [PATCH 1/3] perf tools: Allow to specify libbpf install directory
Date: Wed, 27 Nov 2019 10:48:35 +0100 [thread overview]
Message-ID: <20191127094837.4045-2-jolsa@kernel.org> (raw)
In-Reply-To: <20191127094837.4045-1-jolsa@kernel.org>
Adding LIBBPF_DIR compile variable to allow linking with
libbpf installed into specific directory:
$ make -C tools/lib/bpf/ prefix=/tmp/libbpf/ install_lib install_headers
$ make -C tools/perf/ LIBBPF_DYNAMIC=1 LIBBPF_DIR=/tmp/libbpf/
It might be needed to clean build tree first because features
framework does not detect the change properly:
$ make -C tools/build/feature clean
$ make -C tools/perf/ clean
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Makefile.config | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index c90f4146e5a2..eb9d9b70b7d3 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -22,6 +22,14 @@ include $(srctree)/tools/scripts/Makefile.arch
$(call detected_var,SRCARCH)
+ifndef lib
+ ifeq ($(SRCARCH)$(IS_64_BIT), x861)
+ lib = lib64
+ else
+ lib = lib
+ endif
+endif # lib
+
NO_PERF_REGS := 1
NO_SYSCALL_TABLE := 1
@@ -484,11 +492,22 @@ ifndef NO_LIBELF
CFLAGS += -DHAVE_LIBBPF_SUPPORT
$(call detected,CONFIG_LIBBPF)
+ # for linking with debug library run:
+ # make DEBUG=1 LIBBPF_DIR=/opt/libbpf
+ ifdef LIBBPF_DIR
+ LIBBPF_CFLAGS := -I$(LIBBPF_DIR)/include
+ LIBBPF_LDFLAGS := -L$(LIBBPF_DIR)/$(lib)
+ FEATURE_CHECK_CFLAGS-libbpf := $(LIBBPF_CFLAGS)
+ FEATURE_CHECK_LDFLAGS-libbpf := $(LIBBPF_LDFLAGS)
+ endif
+
# detecting libbpf without LIBBPF_DYNAMIC, so make VF=1 shows libbpf detection status
$(call feature_check,libbpf)
ifdef LIBBPF_DYNAMIC
ifeq ($(feature-libbpf), 1)
EXTLIBS += -lbpf
+ CFLAGS += $(LIBBPF_CFLAGS)
+ LDFLAGS += $(LIBBPF_LDFLAGS)
else
dummy := $(error Error: No libbpf devel library found, please install libbpf-devel);
endif
@@ -1037,13 +1056,6 @@ else
sysconfdir = $(prefix)/etc
ETC_PERFCONFIG = etc/perfconfig
endif
-ifndef lib
-ifeq ($(SRCARCH)$(IS_64_BIT), x861)
-lib = lib64
-else
-lib = lib
-endif
-endif # lib
libdir = $(prefix)/$(lib)
# Shell quote (do not use $(call) to accommodate ancient setups);
@@ -1108,6 +1120,7 @@ ifeq ($(VF),1)
$(call print_var,LIBUNWIND_DIR)
$(call print_var,LIBDW_DIR)
$(call print_var,JDIR)
+ $(call print_var,LIBBPF_DIR)
ifeq ($(dwarf-post-unwind),1)
$(call feature_print_text,"DWARF post unwind library", $(dwarf-post-unwind-text))
--
2.21.0
next prev parent reply other threads:[~2019-11-27 9:49 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 9:48 [PATCH 0/3] perf/bpftool: Allow to link libbpf dynamically Jiri Olsa
2019-11-27 9:48 ` Jiri Olsa [this message]
2019-11-27 9:48 ` [PATCH 2/3] libbpf: Export netlink functions used by bpftool Jiri Olsa
2019-11-27 9:48 ` [PATCH 3/3] bpftool: Allow to link libbpf dynamically Jiri Olsa
2019-11-27 13:38 ` Quentin Monnet
2019-11-27 14:15 ` Jiri Olsa
2019-11-27 14:24 ` Arnaldo Carvalho de Melo
2019-11-27 14:31 ` Quentin Monnet
2019-11-27 15:48 ` Arnaldo Carvalho de Melo
2019-11-27 15:52 ` Quentin Monnet
2019-11-27 15:59 ` Arnaldo Carvalho de Melo
2019-11-27 14:29 ` Quentin Monnet
2019-11-27 16:41 ` Alexei Starovoitov
2019-11-27 16:37 ` [PATCH 0/3] perf/bpftool: " Alexei Starovoitov
2019-11-27 18:44 ` Arnaldo Carvalho de Melo
2019-11-27 20:24 ` Andrii Nakryiko
2019-11-27 21:22 ` Daniel Borkmann
2019-11-27 22:47 ` Jiri Olsa
2019-11-28 9:06 ` Toke Høiland-Jørgensen
2019-11-28 14:53 ` [PATCH bpf v2] bpftool: " Toke Høiland-Jørgensen
2019-11-28 15:32 ` Quentin Monnet
2019-11-28 15:52 ` Toke Høiland-Jørgensen
2019-11-28 16:07 ` [PATCH bpf v3] " Toke Høiland-Jørgensen
2019-11-28 17:30 ` Quentin Monnet
2019-11-29 8:12 ` Jiri Olsa
2019-11-29 8:24 ` Toke Høiland-Jørgensen
2019-11-29 10:24 ` Daniel Borkmann
2019-11-29 14:00 ` Toke Høiland-Jørgensen
2019-11-29 23:56 ` Daniel Borkmann
2019-12-02 8:59 ` Jiri Olsa
2019-12-02 17:09 ` [PATCH 0/3] perf/bpftool: " Andrii Nakryiko
2019-12-02 18:08 ` Toke Høiland-Jørgensen
2019-12-02 18:42 ` Andrii Nakryiko
2019-12-02 18:54 ` Arnaldo Carvalho de Melo
2019-12-02 19:21 ` Jiri Olsa
2019-12-02 19:54 ` Andrii Nakryiko
2019-12-02 20:02 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191127094837.4045-2-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexei.starovoitov@gmail.com \
--cc=andriin@fb.com \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=toke@redhat.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).