commit:     473f1c93f5092d5214d4c7fd253ff561c34a0bb1
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue May 27 13:05:49 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 27 13:08:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473f1c93

sys-libs/libnvme: drop unnecessary glibc specific inlude

Closes: https://bugs.gentoo.org/956710
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42280
Closes: https://github.com/gentoo/gentoo/pull/42280
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libnvme-1.14-remove-glibc-include.patch  | 29 ++++++++++++++++++++++
 sys-libs/libnvme/libnvme-1.14.ebuild               |  4 +++
 2 files changed, 33 insertions(+)

diff --git a/sys-libs/libnvme/files/libnvme-1.14-remove-glibc-include.patch 
b/sys-libs/libnvme/files/libnvme-1.14-remove-glibc-include.patch
new file mode 100644
index 000000000000..725bb8237e3b
--- /dev/null
+++ b/sys-libs/libnvme/files/libnvme-1.14-remove-glibc-include.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/956710
+https://github.com/linux-nvme/libnvme/pull/1016
+https://github.com/linux-nvme/libnvme/commit/9b3ab852075f6da64648145b2d2e56e34354bf45
+
+From 9b3ab852075f6da64648145b2d2e56e34354bf45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <[email protected]>
+Date: Fri, 23 May 2025 12:36:44 +0200
+Subject: [PATCH] examples: remove unnecessary include of <bits/pthreadtypes.h>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The <bits/*.h> header files are GNU libc specific, and should not be
+used directly from application code. This one in particular is already
+included by <pthread.h> on glibc.
+
+Fixes build on musl.
+
+Signed-off-by: Daniel NĂ©ri <[email protected]>
+--- a/examples/mi-mctp-csi-test.c
++++ b/examples/mi-mctp-csi-test.c
+@@ -21,7 +21,6 @@
+ 
+ #include <ccan/array_size/array_size.h>
+ #include <ccan/endian/endian.h>
+-#include <bits/pthreadtypes.h>
+ 
+ void fhexdump(FILE *fp, const unsigned char *buf, int len)
+ {

diff --git a/sys-libs/libnvme/libnvme-1.14.ebuild 
b/sys-libs/libnvme/libnvme-1.14.ebuild
index 06d1cd136724..582ed5b198be 100644
--- a/sys-libs/libnvme/libnvme-1.14.ebuild
+++ b/sys-libs/libnvme/libnvme-1.14.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
 
 distutils_enable_tests unittest
 
+PATCHES=(
+       "${FILESDIR}"/libnvme-1.14-remove-glibc-include.patch
+)
+
 src_prepare() {
        default
        use python && distutils-r1_src_prepare

Reply via email to