summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-01-06 21:50:53 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2021-01-06 21:51:33 +0000
commit1dcb636abf0488aec91b2c22e6279ee53f8c18d4 (patch)
treed21587af1a137a7ae411297cae0201d2544a5da9 /sys-fs/diskdev_cmds/files
parentmedia-libs/libmikmod: Drop removed keywords from use check logic (diff)
downloadgentoo-1dcb636abf0488aec91b2c22e6279ee53f8c18d4.tar.gz
gentoo-1dcb636abf0488aec91b2c22e6279ee53f8c18d4.tar.bz2
gentoo-1dcb636abf0488aec91b2c22e6279ee53f8c18d4.zip
sys-fs/diskdev_cmds: adapt to musl
Reported-by: Toralf Förster Fixed-by: ernsteiswuerfel Closes: https://bugs.gentoo.org/715862 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'sys-fs/diskdev_cmds/files')
-rw-r--r--sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch79
1 files changed, 79 insertions, 0 deletions
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
new file mode 100644
index 000000000000..7e7c3d1d310e
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
@@ -0,0 +1,79 @@
+Port to musl.
+
+Patch-by: ernsteiswuerfel
+Bug: https://bugs.gentoo.org/715862
+--- a/fsck_hfs.tproj/dfalib/CatalogCheck.c
++++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c
+@@ -23,6 +23,7 @@
+ #include "Scavenger.h"
+ #include "DecompDataEnums.h"
+ #include "DecompData.h"
++#include <sys/types.h>
+
+ /*
+ * information collected when visiting catalog records
+--- a/fsck_hfs.tproj/dfalib/SRepair.c
++++ b/fsck_hfs.tproj/dfalib/SRepair.c
+@@ -35,6 +35,7 @@
+ #include "Scavenger.h"
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include "../cache.h"
+
+--- a/fsck_hfs.tproj/dfalib/Scavenger.h
++++ b/fsck_hfs.tproj/dfalib/Scavenger.h
+@@ -44,7 +44,7 @@
+ #include <sys/kauth.h>
+ #include <sys/syslimits.h>
+ #endif
+-#include <sys/errno.h>
++#include <errno.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+--- a/fsck_hfs.tproj/fsck_hfs.h
++++ b/fsck_hfs.tproj/fsck_hfs.h
+@@ -24,6 +24,9 @@
+
+ #include "cache.h"
+
++#ifndef __P
++#define __P(args) args
++#endif
+
+ const extern char *cdevname; /* name of device being checked */
+ extern char *progname;
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -35,7 +35,6 @@
+ #include <time.h>
+ #include "missing.h"
+ #endif
+-#include <sys/errno.h>
+ #include <sys/stat.h>
+ #if !LINUX
+ #include <sys/sysctl.h>
+@@ -69,6 +68,9 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b
+ #include "newfs_hfs.h"
+ #include "readme.h"
+
++#ifndef __P
++#define __P(args) args
++#endif
+
+ #define HFS_BOOT_DATA "/usr/share/hfsprogs/hfsbootdata"
+
+--- a/newfs_hfs.tproj/newfs_hfs.c
++++ b/newfs_hfs.tproj/newfs_hfs.c
+@@ -54,6 +54,9 @@
+ #else
+ #include <varargs.h>
+ #endif
++#ifndef __P
++#define __P(args) args
++#endif
+
+ #define NOVAL (-1)
+ #define UMASK (0755)