From 3b21e04ca20bd47d68d4971a7bc0f1076447b9f3 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 1 Dec 2021 21:14:21 +0000
Subject: sys-kernel/linux-headers: fix build failure of linux sources on musl

Closes: https://bugs.gentoo.org/827927
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../linux-headers/linux-headers-5.15-r1.ebuild     | 50 ++++++++++++++++++++++
 sys-kernel/linux-headers/linux-headers-5.15.ebuild | 45 -------------------
 2 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
 delete mode 100644 sys-kernel/linux-headers/linux-headers-5.15.ebuild

diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
new file mode 100644
index 000000000000..ec21c8e94f69
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+inherit kernel-2 toolchain-funcs
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+PATCH_DEV="sam"
+SRC_URI="
+	${KERNEL_URI}
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/linux-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	if use elibc_musl ; then
+		# TODO: May need forward porting to newer versions
+		eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+	fi
+
+	# avoid kernel-2_src_prepare
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+}
diff --git a/sys-kernel/linux-headers/linux-headers-5.15.ebuild b/sys-kernel/linux-headers/linux-headers-5.15.ebuild
deleted file mode 100644
index 8ac754c008de..000000000000
--- a/sys-kernel/linux-headers/linux-headers-5.15.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
-inherit kernel-2 toolchain-funcs
-detect_version
-
-PATCH_PV=${PV} # to ease testing new versions against not existing patches
-PATCH_VER="1"
-PATCH_DEV="sam"
-SRC_URI="
-	${KERNEL_URI}
-	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
-S="${WORKDIR}/linux-${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl"
-
-[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
-
-src_unpack() {
-	# avoid kernel-2_src_unpack
-	default
-}
-
-src_prepare() {
-	# avoid kernel-2_src_prepare
-	default
-}
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}
-
-src_install() {
-	kernel-2_src_install
-
-	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
-}
-- 
cgit v1.2.3-65-gdbad