diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-04 08:55:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-04 08:55:25 +0000 |
| commit | 3c5ee9928947096e8554f8e7efb1cf50cae3fd87 (patch) | |
| tree | d05fedcd5309183570bb27d7f360687d0e5940c3 /main | |
| parent | 80c278fce2db8e8f31f8cc94336d84ee66f017ba (diff) | |
| download | aports-3c5ee9928947096e8554f8e7efb1cf50cae3fd87.tar.bz2 aports-3c5ee9928947096e8554f8e7efb1cf50cae3fd87.tar.xz | |
main/dosfstools: actually apply the musl fixes
Diffstat (limited to 'main')
| -rw-r--r-- | main/dosfstools/APKBUILD | 21 | ||||
| -rw-r--r-- | main/dosfstools/dosfstools-loff_and_BLOCK_SIZE.patch | 31 | ||||
| -rw-r--r-- | main/dosfstools/musl-fixes.patch | 52 |
3 files changed, 67 insertions, 37 deletions
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD index d72b13f9e7..076044838b 100644 --- a/main/dosfstools/APKBUILD +++ b/main/dosfstools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dosfstools pkgver=3.0.25 -pkgrel=0 +pkgrel=1 pkgdesc="DOS filesystem utilities" url="http://www.daniel-baumann.ch/software/dosfstools/" arch="all" @@ -10,13 +10,22 @@ depends="" makedepends="libiconv-dev" subpackages="$pkgname-doc" source="http://daniel-baumann.ch/files/software/dosfstools/dosfstools-$pkgver.tar.xz - dosfstools-loff_and_BLOCK_SIZE.patch + musl-fixes.patch " _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$_builddir" - make OPTFLAGS="$CFLAGS" LDFLAGS="-liconv $LDFLAGS" || return 1 + make OPTFLAGS="$CFLAGS -D_GNU_SOURCE" LDFLAGS="-liconv $LDFLAGS" || return 1 } package() { @@ -29,8 +38,8 @@ package() { } md5sums="6d000d9f68b7766dfe12c88c4aaaa293 dosfstools-3.0.25.tar.xz -66da181b7245895aac09f51902dcedcb dosfstools-loff_and_BLOCK_SIZE.patch" +fca2443c06dc0149fdb0aff80f1cad3b musl-fixes.patch" sha256sums="1d4912860e88fa829314c7824821b502a66460afc5f4bb963dd149e9ee430320 dosfstools-3.0.25.tar.xz -f9d313d3204c5b2b2a9a9ccb2906cd29aa17f66daa710c8f3358adc6e081479d dosfstools-loff_and_BLOCK_SIZE.patch" +efeec0643e46cabd1c212acf9a06b4a4910454da52a402c6dd0537501ad55a11 musl-fixes.patch" sha512sums="9ff954fb7bb99d430a132add517afaba75a34e9d54d1afff1aa63e2c9ded16b50d89aa3da3bb8b24a03b2a53fc10c800b66bf121ada5e1e047a99478efde3014 dosfstools-3.0.25.tar.xz -7d36320e31502fb977f8f589b0b35a7c4b9358e08bd77852f516a0421a60ebce9190134d22f0d857146de701b1c5655e62b8ae643f87d9e8a09cc41b1fdf742c dosfstools-loff_and_BLOCK_SIZE.patch" +2bec58cf9538b0cd09a72075cf12d0d9a50f0ac9717098b713c72fe7247b0c997ca60a61afb9dfe2f49da42e25019393afa3c19c6e960b6e6559da29fb65e7c7 musl-fixes.patch" diff --git a/main/dosfstools/dosfstools-loff_and_BLOCK_SIZE.patch b/main/dosfstools/dosfstools-loff_and_BLOCK_SIZE.patch deleted file mode 100644 index 6c5d6c7d25..0000000000 --- a/main/dosfstools/dosfstools-loff_and_BLOCK_SIZE.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/fsck.fat.h -+++ src/fsck.fat.h -@@ -27,6 +27,7 @@ - #ifndef _DOSFSCK_H - #define _DOSFSCK_H - -+#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> */ ---- src/io.h -+++ src/io.h -@@ -27,7 +27,7 @@ - #ifndef _IO_H - #define _IO_H - --#include <sys/types.h> /* for loff_t */ -+#include <fcntl.h> /* for loff_t */ - - loff_t llseek(int fd, loff_t offset, int whence); - ---- src/mkfs.fat.c -+++ 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> diff --git a/main/dosfstools/musl-fixes.patch b/main/dosfstools/musl-fixes.patch new file mode 100644 index 0000000000..236615999c --- /dev/null +++ b/main/dosfstools/musl-fixes.patch @@ -0,0 +1,52 @@ +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 + ++#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 + +-#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 + |