commit: 1dcb636abf0488aec91b2c22e6279ee53f8c18d4 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Jan 6 21:50:53 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Jan 6 21:51:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcb636a
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 <AT> gentoo.org> .../diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild | 3 +- .../files/diskdev_cmds-332.14_p1-musl.patch | 79 ++++++++++++++++++++++ 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild index 3fe0634bc4f..16b057b2ea3 100644 --- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild +++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${P}-AR.patch "${FILESDIR}"/${P}-no-sysctl.patch "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-musl.patch ) src_compile() { 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 00000000000..7e7c3d1d310 --- /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)
