From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE379158090 for ; Sun, 29 May 2022 01:39:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 404A2E07EF; Sun, 29 May 2022 01:39:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 231B8E07EF for ; Sun, 29 May 2022 01:39:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3612B341813 for ; Sun, 29 May 2022 01:39:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 991D43AA for ; Sun, 29 May 2022 01:39:54 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1653788388.cb3ba27d18d207d560ce25bbe0ef8cb714238002.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-056.ebuild sys-kernel/dracut/files/056-musl.patch X-VCS-Directories: sys-kernel/dracut/files/ sys-kernel/dracut/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: cb3ba27d18d207d560ce25bbe0ef8cb714238002 X-VCS-Branch: master Date: Sun, 29 May 2022 01:39:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f13ec71e-b1c8-4078-a668-e87cf69b8c49 X-Archives-Hash: a37326aeff0386b30098a109dc557740 commit: cb3ba27d18d207d560ce25bbe0ef8cb714238002 Author: Mike Gilbert gentoo org> AuthorDate: Sun May 29 01:39:03 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun May 29 01:39:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb3ba27d sys-kernel/dracut: fix build on musl Closes: https://bugs.gentoo.org/847919 Signed-off-by: Mike Gilbert gentoo.org> sys-kernel/dracut/dracut-056.ebuild | 1 + sys-kernel/dracut/files/056-musl.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/sys-kernel/dracut/dracut-056.ebuild b/sys-kernel/dracut/dracut-056.ebuild index 35a294f43e10..2b3d51d97aec 100644 --- a/sys-kernel/dracut/dracut-056.ebuild +++ b/sys-kernel/dracut/dracut-056.ebuild @@ -61,6 +61,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/056-musl.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/056-musl.patch b/sys-kernel/dracut/files/056-musl.patch new file mode 100644 index 000000000000..ded188889755 --- /dev/null +++ b/sys-kernel/dracut/files/056-musl.patch @@ -0,0 +1,33 @@ +From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001 +From: Laszlo Gombos +Date: Sun, 20 Feb 2022 22:23:49 -0500 +Subject: [PATCH] fix(install): restore musl support + +__GLIBC_PREREQ is only defined in glibc. +--- + src/install/util.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/install/util.c b/src/install/util.c +index 5721de89e..0af387c27 100644 +--- a/src/install/util.c ++++ b/src/install/util.c +@@ -24,17 +24,15 @@ + #include + #include + #include ++#include + + #include "util.h" + +-#if __GLIBC_PREREQ(2, 30) == 0 +-#include + #ifndef SYS_gettid + #error "SYS_gettid unavailable on this system" + #endif + + #define gettid() ((pid_t) syscall(SYS_gettid)) +-#endif /*__GLIBC_PREREQ */ + + size_t page_size(void) + {