[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzia/

["Thomas Beierlein" <tomjbe@gentoo.org>]

commit:     9c5cb3e5ae603af9a954b70a122bbe0c974f75d2
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 05:31:54 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 05:33:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5cb3e5

dev-libs/libzia: Fix build with MUSL

Closes: https://bugs.gentoo.org/832235
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 dev-libs/libzia/libzia-4.34.ebuild | 10 ++++++++--
 dev-libs/libzia/libzia-4.36.ebuild | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libzia/libzia-4.34.ebuild b/dev-libs/libzia/libzia-4.34.ebuild
index 7d83b69f0dae..e877cfb8b8ca 100644
--- a/dev-libs/libzia/libzia-4.34.ebuild
+++ b/dev-libs/libzia/libzia-4.34.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
@@ -18,7 +18,8 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	media-libs/libsdl
 	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:1 )"
+	ftdi? ( dev-embedded/libftdi:1 )
+	elibc_musl? ( sys-libs/libunwind )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -32,10 +33,15 @@ src_prepare() {
 	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
 	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
 
+	# fix build for MUSL (bug #832235)
+	if use elibc_musl ; then
+		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
+	fi
 	eautoreconf
 }
 
 src_configure() {
+	use elibc_musl && append-libs -lunwind
 	econf \
 		$(use_with ftdi) --with-sdl \
 		--with-png --without-bfd \

diff --git a/dev-libs/libzia/libzia-4.36.ebuild b/dev-libs/libzia/libzia-4.36.ebuild
index 7d83b69f0dae..e877cfb8b8ca 100644
--- a/dev-libs/libzia/libzia-4.36.ebuild
+++ b/dev-libs/libzia/libzia-4.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
@@ -18,7 +18,8 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	media-libs/libsdl
 	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:1 )"
+	ftdi? ( dev-embedded/libftdi:1 )
+	elibc_musl? ( sys-libs/libunwind )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -32,10 +33,15 @@ src_prepare() {
 	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
 	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
 
+	# fix build for MUSL (bug #832235)
+	if use elibc_musl ; then
+		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
+	fi
 	eautoreconf
 }
 
 src_configure() {
+	use elibc_musl && append-libs -lunwind
 	econf \
 		$(use_with ftdi) --with-sdl \
 		--with-png --without-bfd \