From 474f171b5d9cc9b5ca9bd4b7ce848b1ee8a00ef5 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sun, 5 Oct 2025 22:56:18 +0300 Subject: [PATCH] sys-apps/isapnptools: fix compile on musl Copied this patch from ::musl overlay (whose origin is unknown since it appeared as part of initial commit in that repo). The change itself consists of 2 fixes: 1. Adding "#include " which is safe 2. converting conditional include into consistent "#include " which should work on all libc we care about in Gentoo. I don't see a reason to cause rebuild with this patch, since where it managed to build work as needed, so no need for revbump. Closes: https://bugs.gentoo.org/712764 Closes: https://bugs.gentoo.org/889557 Signed-off-by: Arthur Zamarin --- .../files/isapnptools-1.27-musl.patch | 30 +++++++++++++++++++ .../isapnptools/isapnptools-1.27-r1.ebuild | 1 + 2 files changed, 31 insertions(+) create mode 100644 sys-apps/isapnptools/files/isapnptools-1.27-musl.patch diff --git a/sys-apps/isapnptools/files/isapnptools-1.27-musl.patch b/sys-apps/isapnptools/files/isapnptools-1.27-musl.patch new file mode 100644 index 0000000000000..d330b54e4b293 --- /dev/null +++ b/sys-apps/isapnptools/files/isapnptools-1.27-musl.patch @@ -0,0 +1,30 @@ +--- a/include/isapnp/iopl.h ++++ b/include/isapnp/iopl.h +@@ -52,15 +52,7 @@ extern "C" { + #include + #else + #ifndef _OS2_ +-# if defined __GLIBC__ && __GLIBC__ >= 2 +-# include +-# else +-# ifdef _AXP_ +-# include +-# else +-# include +-# endif +-# endif /* __GLIBC__ */ ++#include + #else + #include + #endif /* _OS2_ */ +--- a/src/pnp-select.c ++++ b/src/pnp-select.c +@@ -6,6 +6,8 @@ + Foundation. + */ + ++#include ++ + #ifdef HAVE_CONFIG_H + #include + #endif diff --git a/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild index 6deeaf3e44070..3ad477dcd81c9 100644 --- a/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild +++ b/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild @@ -17,6 +17,7 @@ PATCHES=( "${FILESDIR}"/${P}-include.patch "${FILESDIR}"/${P}-fno-common.patch "${FILESDIR}"/${P}-incompatible-pointer-types.patch + "${FILESDIR}"/${P}-musl.patch ) src_configure() {