From: Mike Leach <mike.leach@linaro.org>
To: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, acme@kernel.org, irogers@google.com
Cc: peterz@infradead.org, mingo@redhat.com, mark.rutland@arm.com,
alexander.shishkin@linux.intel.com, jolsa@kernel.org,
namhyung@kernel.org, Mike Leach <mike.leach@linaro.org>
Subject: [PATCH] perf build: Fix build error when NO_LIBBPF=1
Date: Thu, 5 Jan 2023 17:22:43 +0000 [thread overview]
Message-ID: <20230105172243.7238-1-mike.leach@linaro.org> (raw)
Recent updates to perf build result in the following output when cross
compiling to aarch64, with libelf unavailable, and therefore
NO_LIBBPF=1 set.
```
$make -C tools/perf
<cut>
Makefile.config:428: No libelf found. Disables 'probe' tool, jvmti
and BPF support in 'perf record'. Please install libelf-dev,
libelf-devel or elfutils-libelf-devel
<cut>
libbpf.c:46:10: fatal error: libelf.h: No such file or directory
46 | #include <libelf.h>
| ^~~~~~~~~~
compilation terminated.
./tools/build/Makefile.build:96: recipe for target
'.tools/perf/libbpf/staticobjs/libbpf.o' failed
```
plus one other include error for <gelf.h>
The issue is that the commit noted below adds libbpf to the prepare:
target but no longer accounts for the NO_LIBBPF define. Additionally
changing the include directories means that even if the libbpf target
build is prevented, bpf headers are missing in other parts of the build.
This patch ensures that in the case of NO_LIBBPF=1, the build target is
changed to a header only target, and the headers are installed, without
attempting to build the libbpf.a target.
Applies to perf/core
Fixes: 746bd29e348f ("perf build: Use tools/lib headers from install path")
Signed-off-by: Mike Leach <mike.leach@linaro.org>
---
tools/perf/Makefile.perf | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 13e7d26e77f0..ee08ecf469f6 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -305,7 +305,11 @@ else
endif
LIBBPF_DESTDIR = $(LIBBPF_OUTPUT)
LIBBPF_INCLUDE = $(LIBBPF_DESTDIR)/include
+ifndef NO_LIBBPF
LIBBPF = $(LIBBPF_OUTPUT)/libbpf.a
+else
+LIBBPF = $(LIBBPF_INCLUDE)/bpf/bpf.h
+endif
CFLAGS += -I$(LIBBPF_OUTPUT)/include
ifneq ($(OUTPUT),)
@@ -826,10 +830,16 @@ $(LIBAPI)-clean:
$(call QUIET_CLEAN, libapi)
$(Q)$(RM) -r -- $(LIBAPI_OUTPUT)
+ifndef NO_LIBBPF
$(LIBBPF): FORCE | $(LIBBPF_OUTPUT)
$(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=$(FEATURE_DUMP_EXPORT) \
O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \
$@ install_headers
+else
+$(LIBBPF): FORCE | $(LIBBPF_OUTPUT)
+ $(Q)$(MAKE) -C $(LIBBPF_DIR) OUTPUT=$(LIBBPF_OUTPUT)/ \
+ DESTDIR=$(LIBBPF_DESTDIR) prefix= install_headers
+endif
$(LIBBPF)-clean:
$(call QUIET_CLEAN, libbpf)
--
2.17.1
next reply other threads:[~2023-01-05 17:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-05 17:22 Mike Leach [this message]
2023-01-05 19:02 ` [PATCH] perf build: Fix build error when NO_LIBBPF=1 Ian Rogers
2023-01-05 23:40 ` Mike Leach
2023-01-06 6:24 ` Ian Rogers
2023-01-06 9:58 ` Mike Leach
2023-01-06 14:36 ` Ian Rogers
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=20230105172243.7238-1-mike.leach@linaro.org \
--to=mike.leach@linaro.org \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bpf@vger.kernel.org \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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).