[gentoo-commits] repo/gentoo:master commit in: sys-devel/dwz/

["Sam James" <sam@gentoo.org>]

commit:     f5e4426903441825f7f37080a9712f754d6c4c38
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 27 17:01:01 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 17:01:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e44269

sys-devel/dwz: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/dwz/dwz-9999.ebuild | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/sys-devel/dwz/dwz-9999.ebuild b/sys-devel/dwz/dwz-9999.ebuild
index 7692569e9bca..2087550f34b4 100644
--- a/sys-devel/dwz/dwz-9999.ebuild
+++ b/sys-devel/dwz/dwz-9999.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
 	S="${WORKDIR}/${PN}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
@@ -25,6 +25,10 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-libs/elfutils
 	dev-libs/xxhash
+	elibc_musl? (
+		>=sys-libs/error-standalone-2.0
+		sys-libs/obstack-standalone
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -33,6 +37,7 @@ BDEPEND="
 		dev-libs/elfutils[utils]
 		dev-util/dejagnu
 	)
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -43,13 +48,21 @@ src_prepare() {
 src_compile() {
 	export LANG=C LC_ALL=C  # grep find nothing for non-ascii locales
 
-	emake CFLAGS="${CFLAGS}" srcdir="${S}"
+	tc-export PKG_CONFIG
+
+	export LIBS="-lelf"
+	if use elibc_musl; then
+		export CFLAGS="${CFLAGS} $(${PKG_CONFIG} --cflags obstack-standalone error-standalone)"
+		export LIBS="${LIBS} $(${PKG_CONFIG} --libs obstack-standalone error-standalone)"
+	fi
+
+	emake CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}"
 }
 
 src_test() {
-	emake CFLAGS="${CFLAGS}" srcdir="${S}" check
+	emake CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}" check
 }
 
 src_install() {
-	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" srcdir="${S}" install
+	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}" install
 }