[gentoo-commits] repo/gentoo:master commit in: app-forensics/honggfuzz/, app-forensics/honggfuzz/files/

[Marek Szuba]

commit:     ad8f95bc0feb13a824d6287f63960e842c3d8679
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 19:32:37 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 19:33:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8f95bc

app-forensics/honggfuzz: fix building against musl

With many thanks to sam for having pointed me to queue-standalone!

Closes: https://bugs.gentoo.org/715648
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/honggfuzz-2.4-headers-musl.patch         | 45 ++++++++++++++++++++++
 app-forensics/honggfuzz/honggfuzz-2.4.ebuild       |  6 ++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/app-forensics/honggfuzz/files/honggfuzz-2.4-headers-musl.patch b/app-forensics/honggfuzz/files/honggfuzz-2.4-headers-musl.patch
new file mode 100644
index 000000000000..e70d6eae4eaf
--- /dev/null
+++ b/app-forensics/honggfuzz/files/honggfuzz-2.4-headers-musl.patch
@@ -0,0 +1,45 @@
+From 29864795b194481dd0446326cda89b9802f4fe51 Mon Sep 17 00:00:00 2001
+From: David Carlier <devnexen@×××××.com>
+Date: Sat, 8 May 2021 11:23:32 +0100
+Subject: [PATCH] musl build fix proposal
+
+--- a/linux/arch.c
++++ b/linux/arch.c
+@@ -34,7 +34,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(__GLIBC__)
+ #include <sys/cdefs.h>
++#endif
+ #include <sys/personality.h>
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
+--- a/linux/perf.c
++++ b/linux/perf.c
+@@ -30,12 +30,12 @@
+ #include <linux/hw_breakpoint.h>
+ #include <linux/perf_event.h>
+ #include <linux/sysctl.h>
++#include <poll.h>
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+-#include <sys/poll.h>
+ #include <sys/ptrace.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+--- a/linux/trace.c
++++ b/linux/trace.c
+@@ -34,7 +34,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(__GLIBC__)
+ #include <sys/cdefs.h>
++#endif
+ #include <sys/personality.h>
+ #include <sys/ptrace.h>
+ #include <sys/resource.h>

diff --git a/app-forensics/honggfuzz/honggfuzz-2.4.ebuild b/app-forensics/honggfuzz/honggfuzz-2.4.ebuild
index e73640196eb9..5220a5f4c483 100644
--- a/app-forensics/honggfuzz/honggfuzz-2.4.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="clang"
+IUSE="clang elibc_musl"
 
 RDEPEND="
 	>=sys-libs/binutils-libs-2.29:=
@@ -21,7 +21,8 @@ RDEPEND="
 	clang? ( sys-libs/blocksruntime )
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
 
 DOCS=(
 	CHANGELOG
@@ -32,6 +33,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-no-werror.patch
+	"${FILESDIR}"/${PN}-2.4-headers-musl.patch
 )
 
 pkg_pretend() {