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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB9401382C5 for ; Wed, 10 Mar 2021 01:24:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4645DE086A; Wed, 10 Mar 2021 01:24:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CBB2E0869 for ; Wed, 10 Mar 2021 01:24:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99D72340D11 for ; Wed, 10 Mar 2021 01:24:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D81725B4 for ; Wed, 10 Mar 2021 01:24:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615337820.88f1074d0291e321e9765f358b4806dc9a8ad457.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch X-VCS-Directories: sys-fs/dmraid/files/ sys-fs/dmraid/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 88f1074d0291e321e9765f358b4806dc9a8ad457 X-VCS-Branch: master Date: Wed, 10 Mar 2021 01:24:24 +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: 3d153604-2da5-4067-a072-7c9bbec251ee X-Archives-Hash: 98246846c781eefd256623cac11c3c10 commit: 88f1074d0291e321e9765f358b4806dc9a8ad457 Author: Sam James gentoo org> AuthorDate: Wed Mar 10 00:57:00 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 10 00:57:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f1074d sys-fs/dmraid: add musl patch Closes: https://bugs.gentoo.org/717430 Signed-off-by: Sam James gentoo.org> sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild | 4 ++++ sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild index ac268a35d6c..e76bae706c5 100644 --- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild @@ -41,12 +41,16 @@ src_prepare() { eapply -p0 "${FILESDIR}"/${P}-static-build-fixes.patch eapply -p3 "${FILESDIR}"/${P}-parallel-make.patch eapply "${FILESDIR}"/${P}-fix-missing-PATH-MOUNTED.patch + eapply "${FILESDIR}"/${PN}-1.0.0_rc16-musl.patch # pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it einfo "Appending pkg.m4 from system to aclocal.m4" cat "${BROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4" + mv configure.{in,ac} || die + default + eautoreconf einfo "Creating prepatched source archive for use with Genkernel" diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch new file mode 100644 index 00000000000..d43ed635471 --- /dev/null +++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/717430 +https://git.alpinelinux.org/aports/plain/main/dmraid/006-musl-libc.patch +--- a/include/dmraid/misc.h ++++ b/include/dmraid/misc.h +@@ -10,6 +10,7 @@ + + #ifndef _MISC_H_ + #define _MISC_H_ ++#include + + #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0); + +--- a/lib/device/scan.c ++++ b/lib/device/scan.c +@@ -10,6 +10,7 @@ + # include + # include + #else ++# include + # include + # include + #endif