[gentoo-commits] repo/gentoo:master commit in: sys-fs/erofs-utils/files/, sys-fs/erofs-utils/

[Florian Schmaus]

commit:     8bb15cf3b80f086cf3b4a9133e47abe9d60d6624
Author:     WANG Xuerui <git <AT> xen0n <DOT> name>
AuthorDate: Tue Jan 18 06:54:33 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 07:58:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb15cf3

sys-fs/erofs-utils: fix build on musl

Closes: https://bugs.gentoo.org/831015
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: WANG Xuerui <git <AT> xen0n.name>
Closes: https://github.com/gentoo/gentoo/pull/23850
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-fs/erofs-utils/erofs-utils-1.4.ebuild          |  1 +
 .../files/1.4-fsck-add-missing-include.patch       | 31 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
index be9b257859bf..158c90277a0b 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
@@ -26,6 +26,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-dump-fix-de-nid-issues.patch"
+	"${FILESDIR}/${PV}-fsck-add-missing-include.patch"
 )
 
 src_prepare() {

diff --git a/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch b/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch
new file mode 100644
index 000000000000..8e4f6ac3d336
--- /dev/null
+++ b/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch
@@ -0,0 +1,31 @@
+From 2ac662b01de904802da4e84d0738e47bf573efde Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@××××××××××.de>
+Date: Mon, 6 Dec 2021 20:14:03 +0100
+Subject: [PATCH 2/2] fsck/main.c: add missing include
+
+Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR
+definitions.
+
+Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex@××××××××××.de
+Reviewed-by: Gao Xiang <hsiangkao@×××××××××××××.com>
+Signed-off-by: Alexander Kanavin <alex@××××××××××.de>
+Signed-off-by: Gao Xiang <hsiangkao@×××××××××××××.com>
+---
+ fsck/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/fsck/main.c b/fsck/main.c
+index aefa881..ad48e35 100644
+--- a/fsck/main.c
++++ b/fsck/main.c
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <getopt.h>
+ #include <time.h>
++#include <sys/stat.h>
+ #include "erofs/print.h"
+ #include "erofs/io.h"
+ #include "erofs/decompress.h"
+-- 
+2.34.1
+