[gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/, sys-auth/libfprint/files/

[Sam James]

commit:     e3aaa3286a6a831276779a3466509f28d7d074b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 05:00:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 05:00:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3aaa328

sys-auth/libfprint: fix musl build

Closes: https://bugs.gentoo.org/853811
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libfprint-1.94.4-stderr-redefinition.patch     | 24 ++++++++++++++++++++++
 sys-auth/libfprint/libfprint-1.94.4.ebuild         |  1 +
 2 files changed, 25 insertions(+)

diff --git a/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch b/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch
new file mode 100644
index 000000000000..fa7f4aac0986
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch
@@ -0,0 +1,24 @@
+https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/366
+
+From 2584d440afc87d463cb8dc809d48c660e091c2c4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@g.o>
+Date: Thu, 23 Jun 2022 05:57:46 +0100
+Subject: [PATCH] nbis: fix build on musl
+
+Drop re-definition of stderr. There's no need for this anywhere
+(including glibc). This breaks in particular on musl because
+stderr (and stdin) are both const, and macros unlike in glibc.
+
+Bug: https://bugs.gentoo.org/853811
+--- a/libfprint/nbis/include/bozorth.h
++++ b/libfprint/nbis/include/bozorth.h
+@@ -217,8 +217,6 @@ struct xytq_struct {
+ /**************************************************************************/
+ /* Globals supporting command line options */
+ extern int verbose_threshold;
+-/* Global supporting error reporting */
+-extern FILE *stderr;
+ 
+ /**************************************************************************/
+ /* In: BZ_GBLS.C */
+GitLab

diff --git a/sys-auth/libfprint/libfprint-1.94.4.ebuild b/sys-auth/libfprint/libfprint-1.94.4.ebuild
index ea51f46bd2c5..5a5defa19e28 100644
--- a/sys-auth/libfprint/libfprint-1.94.4.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.4.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
+	"${FILESDIR}"/${PN}-1.94.4-stderr-redefinition.patch
 )
 
 src_configure() {