[patch] sys-block/gpart: fixes for musl libc

0001-sys-block-gpart-fixes-for-musl-libc.patch (text/plain), 2.87 KB, created by CFuga on 2022-08-10 22:33:11 UTC

From 5bdd46197b1e0eaa48641c6433eb089e229547df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Oth=C3=B3n=20Mart=C3=ADnez=20Vera?=
 <[e-mail]>
Date: Wed, 10 Aug 2022 17:20:47 -0500
Subject: [PATCH] sys-block/gpart: fixes for musl libc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch includes:
* fix type definition for loff_t
* fix type definition for daddr_t

Signed-off-by: Cristian Othón Martínez Vera <[e-mail]>
Bug: 715842
---
 sys-block/gpart/files/gpart-0.3-daddr_t.patch | 20 +++++++++++++++++++
 sys-block/gpart/files/gpart-0.3-loff_t.patch  | 12 +++++++++++
 sys-block/gpart/gpart-0.3.ebuild              |  4 +++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 sys-block/gpart/files/gpart-0.3-daddr_t.patch
 create mode 100644 sys-block/gpart/files/gpart-0.3-loff_t.patch

diff --git a/sys-block/gpart/files/gpart-0.3-daddr_t.patch b/sys-block/gpart/files/gpart-0.3-daddr_t.patch
new file mode 100644
index 00000000000..47197dcb90b
--- /dev/null
+++ b/sys-block/gpart/files/gpart-0.3-daddr_t.patch
@@ -0,0 +1,20 @@
+diff -uNr a/src/gm_s86dl.h b/src/gm_s86dl.h
+--- a/src/gm_s86dl.h	2015-11-24 05:03:45.000000000 -0600
++++ b/src/gm_s86dl.h	2021-05-24 17:33:38.000000000 -0500
+@@ -17,6 +17,7 @@
+ #ifndef _GM_S86DL_H
+ #define _GM_S86DL_H
+ 
++#include <linux/types.h>
+ 
+ #define SOLARIS_X86_NUMSLICE		8
+ #define SOLARIS_X86_VTOC_SANE		(0x600DDEEEUL)
+@@ -40,7 +41,7 @@
+ struct solaris_x86_slice {
+ 	ushort	s_tag;			/* ID tag of partition */
+ 	ushort	s_flag;			/* permision flags */
+-	daddr_t s_start;		/* start sector no of partition */
++	__kernel_daddr_t s_start;	/* start sector no of partition */
+ 	long	s_size;			/* # of blocks in partition */
+ };
+ 
diff --git a/sys-block/gpart/files/gpart-0.3-loff_t.patch b/sys-block/gpart/files/gpart-0.3-loff_t.patch
new file mode 100644
index 00000000000..e9f13589526
--- /dev/null
+++ b/sys-block/gpart/files/gpart-0.3-loff_t.patch
@@ -0,0 +1,12 @@
+diff -uNr a/src/l64seek.h b/src/l64seek.h
+--- a/src/l64seek.h	2015-11-24 05:03:45.000000000 -0600
++++ b/src/l64seek.h	2021-05-24 17:28:31.000000000 -0500
+@@ -27,7 +27,7 @@
+  * offsets.
+  */
+ 
+-typedef loff_t off64_t;
++typedef off_t off64_t;
+ typedef off64_t s64_t;
+ 
+ off64_t l64seek(int fd, off64_t offset, int whence);
diff --git a/sys-block/gpart/gpart-0.3.ebuild b/sys-block/gpart/gpart-0.3.ebuild
index 441fcf00034..cdbe7753e3e 100644
--- a/sys-block/gpart/gpart-0.3.ebuild
+++ b/sys-block/gpart/gpart-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,8 @@ RDEPEND=""
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.1h-errno.patch
 	"${FILESDIR}"/${PN}-0.3-build.patch
+	"${FILESDIR}"/${PN}-0.3-loff_t.patch
+	"${FILESDIR}"/${PN}-0.3-daddr_t.patch
 )
 
 src_prepare() {
-- 
2.35.1