From: Leo Yan <leo.yan@arm.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
James Clark <james.clark@arm.com>,
Ian Rogers <irogers@google.com>,
"Liang, Kan" <kan.liang@linux.intel.com>,
Nick Terrell <terrelln@fb.com>,
Thomas Richter <tmricht@linux.ibm.com>,
Changbin Du <changbin.du@huawei.com>,
Fangrui Song <maskray@google.com>,
"Mateusz Kowalczyk" <fuuzetsu@fuuzetsu.co.uk>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Cc: Leo Yan <leo.yan@arm.com>
Subject: [PATCH v1 4/6] perf: build: Only link libebl.a for old libdw
Date: Tue, 4 Jun 2024 10:32:21 +0100 [thread overview]
Message-ID: <20240604093223.1934236-5-leo.yan@arm.com> (raw)
In-Reply-To: <20240604093223.1934236-1-leo.yan@arm.com>
Since libdw version 0.177, elfutils has merged libebl.a into libdw (see
the commit "libebl: Don't install libebl.a, libebl.h and remove backends
from spec." in the elfutils repository).
As a result, libebl.a does not exist on Debian Bullseye and newer
releases, causing static perf builds to fail on these distributions.
This commit checks the libdw version and only links libebl.a if it
detects that the libdw version is older than 0.177.
Signed-off-by: Leo Yan <leo.yan@arm.com>
---
tools/build/feature/Makefile | 12 +++++++++++-
tools/perf/Makefile.config | 12 +++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index 6f52f892f9a3..2f4cfb7b8c14 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -159,7 +159,17 @@ $(OUTPUT)test-libopencsd.bin:
DWARFLIBS := -ldw
ifeq ($(findstring -static,${LDFLAGS}),-static)
-DWARFLIBS += -lelf -lebl -lz -llzma -lbz2
+ DWARFLIBS += -lelf -lz -llzma -lbz2
+
+ LIBDW_VERSION := $(shell $(PKG_CONFIG) --modversion libdw)
+ LIBDW_VERSION_1 := $(word 1, $(subst ., ,$(LIBDW_VERSION)))
+ LIBDW_VERSION_2 := $(word 2, $(subst ., ,$(LIBDW_VERSION)))
+
+ # Elfutils merged libebl.a into libdw.a starting from version 0.177,
+ # Link libebl.a only if libdw is older than this version.
+ ifeq ($(shell test $(LIBDW_VERSION_2) -lt 177; echo $$?),0)
+ DWARFLIBS += -lebl
+ endif
endif
$(OUTPUT)test-dwarf.bin:
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 646e5af0ed51..e8d3713b081c 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -152,7 +152,17 @@ ifdef LIBDW_DIR
endif
DWARFLIBS := -ldw
ifeq ($(findstring -static,${LDFLAGS}),-static)
- DWARFLIBS += -lelf -lebl -ldl -lz -llzma -lbz2
+ DWARFLIBS += -lelf -ldl -lz -llzma -lbz2
+
+ LIBDW_VERSION := $(shell $(PKG_CONFIG) --modversion libdw)
+ LIBDW_VERSION_1 := $(word 1, $(subst ., ,$(LIBDW_VERSION)))
+ LIBDW_VERSION_2 := $(word 2, $(subst ., ,$(LIBDW_VERSION)))
+
+ # Elfutils merged libebl.a into libdw.a starting from version 0.177,
+ # Link libebl.a only if libdw is older than this version.
+ ifeq ($(shell test $(LIBDW_VERSION_2) -lt 177; echo $$?),0)
+ DWARFLIBS += -lebl
+ endif
endif
FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) $(DWARFLIBS)
--
2.34.1
next prev parent reply other threads:[~2024-06-04 9:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 9:32 [PATCH v1 0/6] perf: build: Fix cross compilation Leo Yan
2024-06-04 9:32 ` [PATCH v1 1/6] perf: build: Setup PKG_CONFIG_LIBDIR for " Leo Yan
2024-06-06 17:28 ` Namhyung Kim
2024-06-07 12:50 ` Leo Yan
2024-06-04 9:32 ` [PATCH v1 2/6] perf: build: Append libtraceevent path in PKG_CONFIG_LIBDIR Leo Yan
2024-06-04 9:32 ` [PATCH v1 3/6] perf: build: Set Python configuration for cross compilation Leo Yan
2024-06-04 9:32 ` Leo Yan [this message]
2024-06-06 17:40 ` [PATCH v1 4/6] perf: build: Only link libebl.a for old libdw Namhyung Kim
2024-06-07 13:33 ` Leo Yan
2024-06-04 9:32 ` [PATCH v1 5/6] perf: build: Link lib 'lzma' for static build Leo Yan
2024-06-04 9:32 ` [PATCH v1 6/6] perf: build: Link lib 'zstd' " Leo Yan
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=20240604093223.1934236-5-leo.yan@arm.com \
--to=leo.yan@arm.com \
--cc=acme@kernel.org \
--cc=changbin.du@huawei.com \
--cc=fuuzetsu@fuuzetsu.co.uk \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maskray@google.com \
--cc=namhyung@kernel.org \
--cc=terrelln@fb.com \
--cc=tmricht@linux.ibm.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
all inboxes | Powered by JetHome®