From e34418b72b97118e4d781ffbd75d9f5afccf27dd Mon Sep 17 00:00:00 2001 From: "Z. Liu" Date: Mon, 27 Jan 2025 13:38:01 +0800 Subject: [PATCH] sys-devel/dwz: fix build w/ llvm profile llvm-readelf has different arguments w/ gnu readelf, so always define READELF as the one in binutils. Please note: dwz-0.15-readelf.patch isn't applied by upstream. See also: https://sourceware.org/bugzilla/show_bug.cgi?id=32611 Closes: https://bugs.gentoo.org/945628 Signed-off-by: Z. Liu Part-of: https://github.com/gentoo/gentoo/pull/40327 Closes: https://github.com/gentoo/gentoo/pull/40327 Signed-off-by: Sam James --- sys-devel/dwz/dwz-0.15-r4.ebuild | 5 ++++- sys-devel/dwz/dwz-0.15-r5.ebuild | 5 ++++- sys-devel/dwz/dwz-9999.ebuild | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys-devel/dwz/dwz-0.15-r4.ebuild b/sys-devel/dwz/dwz-0.15-r4.ebuild index 329c701a49732..96ce05dabb125 100644 --- a/sys-devel/dwz/dwz-0.15-r4.ebuild +++ b/sys-devel/dwz/dwz-0.15-r4.ebuild @@ -54,7 +54,10 @@ src_prepare() { src_compile() { export LANG=C LC_ALL=C # grep find nothing for non-ascii locales - tc-export PKG_CONFIG + local current_binutils_path=$(binutils-config -B) + export READELF="${current_binutils_path}/readelf" + + tc-export PKG_CONFIG READELF export LIBS="-lelf" if use elibc_musl; then diff --git a/sys-devel/dwz/dwz-0.15-r5.ebuild b/sys-devel/dwz/dwz-0.15-r5.ebuild index 3e791fa62af79..6d6533ae4965e 100644 --- a/sys-devel/dwz/dwz-0.15-r5.ebuild +++ b/sys-devel/dwz/dwz-0.15-r5.ebuild @@ -54,7 +54,10 @@ src_prepare() { src_compile() { export LANG=C LC_ALL=C # grep find nothing for non-ascii locales - tc-export PKG_CONFIG + local current_binutils_path=$(binutils-config -B) + export READELF="${current_binutils_path}/readelf" + + tc-export PKG_CONFIG READELF export LIBS="-lelf" if use elibc_musl; then diff --git a/sys-devel/dwz/dwz-9999.ebuild b/sys-devel/dwz/dwz-9999.ebuild index 2087550f34b40..4fee7e3d80aa8 100644 --- a/sys-devel/dwz/dwz-9999.ebuild +++ b/sys-devel/dwz/dwz-9999.ebuild @@ -48,7 +48,10 @@ src_prepare() { src_compile() { export LANG=C LC_ALL=C # grep find nothing for non-ascii locales - tc-export PKG_CONFIG + local current_binutils_path=$(binutils-config -B) + export READELF="${current_binutils_path}/readelf" + + tc-export PKG_CONFIG READELF export LIBS="-lelf" if use elibc_musl; then