diff options
Diffstat (limited to 'main/dosfstools/musl-fixes.patch')
-rw-r--r-- | main/dosfstools/musl-fixes.patch | 59 |
1 files changed, 9 insertions, 50 deletions
diff --git a/main/dosfstools/musl-fixes.patch b/main/dosfstools/musl-fixes.patch index 236615999c..462aacfb9a 100644 --- a/main/dosfstools/musl-fixes.patch +++ b/main/dosfstools/musl-fixes.patch @@ -1,52 +1,11 @@ -From 94e3cad801856faa63b502b1ad745ec47fde70f7 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 4 Feb 2014 08:44:30 +0000 -Subject: [PATCH] Build fixes for musl libc - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - src/fsck.fat.h | 1 + - src/io.h | 2 +- - src/mkfs.fat.c | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/fsck.fat.h b/src/fsck.fat.h -index 9d4bb16..e5ade5b 100644 ---- a/src/fsck.fat.h -+++ b/src/fsck.fat.h -@@ -27,6 +27,7 @@ - #ifndef _DOSFSCK_H - #define _DOSFSCK_H +--- ./src/mkfs.fat.c.orig ++++ ./src/mkfs.fat.c +@@ -1412,7 +1412,7 @@ -+#include <fcntl.h> - #include <sys/types.h> - #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ - #define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h> */ -diff --git a/src/io.h b/src/io.h -index ea0e35d..d23d07e 100644 ---- a/src/io.h -+++ b/src/io.h -@@ -27,7 +27,7 @@ - #ifndef _IO_H - #define _IO_H + gettimeofday(&create_timeval, NULL); + create_time = create_timeval.tv_sec; +- volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); /* Default volume ID = creation time, fudged for more uniqueness */ ++ volume_id = (uint32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); /* Default volume ID = creation time, fudged for more uniqueness */ + check_atari(); --#include <sys/types.h> /* for loff_t */ -+#include <fcntl.h> /* for loff_t */ - - loff_t llseek(int fd, loff_t offset, int whence); - -diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c -index 96ba47e..604b7d0 100644 ---- a/src/mkfs.fat.c -+++ b/src/mkfs.fat.c -@@ -49,6 +49,7 @@ - #include <fcntl.h> - #include <linux/hdreg.h> - #include <sys/mount.h> -+#include <linux/fs.h> - #include <linux/fd.h> - #include <endian.h> - #include <mntent.h> --- -1.8.5.3 - + printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n"); |