aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-17 13:53:52 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-17 13:53:52 +0000
commit3b3e80ffaef4ce1eb8a5107cb7be277ac6700cff (patch)
treeeb6b0df0a33cf02666c604ed5b1494245e050b5f
parent98f1cffd2e8b1a8ff81ba3da9a229e03705bd2c7 (diff)
downloadaports-3b3e80ffaef4ce1eb8a5107cb7be277ac6700cff.tar.bz2
aports-3b3e80ffaef4ce1eb8a5107cb7be277ac6700cff.tar.xz
main/f2fs-tools: fix musl build
-rw-r--r--main/f2fs-tools/APKBUILD15
-rw-r--r--main/f2fs-tools/musl-fix-includes.patch10
2 files changed, 20 insertions, 5 deletions
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 53580752bc..39d09a403e 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=f2fs-tools
pkgver=1.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Tools for Flash-Friendly File System (F2FS)"
url="http://sourceforge.net/projects/f2fs-tools/"
arch="all"
@@ -12,7 +12,9 @@ makedepends="$depends_dev automake autoconf libtool util-linux-dev"
install=""
subpackages="$pkgname-doc"
#source="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-$pkgver.tar.gz"
-source="http://dev.alpinelinux.org/archive/f2fs-tools/f2fs-tools-$pkgver.tar.gz"
+source="http://dev.alpinelinux.org/archive/f2fs-tools/f2fs-tools-$pkgver.tar.gz
+ musl-fix-includes.patch
+ "
_builddir="$srcdir"/f2fs-tools-$pkgver
prepare() {
@@ -43,6 +45,9 @@ package() {
rm "$pkgdir"/usr/lib/*.la
}
-md5sums="d27ad7cd56f6001f7e1d508d85eef195 f2fs-tools-1.2.0.tar.gz"
-sha256sums="243361c689d851f70feb0e5c97a93394392dc0629f965bcebda9ca825315f732 f2fs-tools-1.2.0.tar.gz"
-sha512sums="f259c354c849e84269a8218ad738b38e8a40ac39be1355d323dab6fdf5d58145759db229cceb51524462aad1ef14d3ee57df4c398bb40b3b5288a1869e5567ab f2fs-tools-1.2.0.tar.gz"
+md5sums="d27ad7cd56f6001f7e1d508d85eef195 f2fs-tools-1.2.0.tar.gz
+58f111607726f2e4db5f5622359e621a musl-fix-includes.patch"
+sha256sums="243361c689d851f70feb0e5c97a93394392dc0629f965bcebda9ca825315f732 f2fs-tools-1.2.0.tar.gz
+4eaa40dbac52ae4a83a09e5414557bab495afc2b0cb36085eef4c018ebfd42fd musl-fix-includes.patch"
+sha512sums="f259c354c849e84269a8218ad738b38e8a40ac39be1355d323dab6fdf5d58145759db229cceb51524462aad1ef14d3ee57df4c398bb40b3b5288a1869e5567ab f2fs-tools-1.2.0.tar.gz
+0d5d83d992acc0477e3de4981853c6e7757335fa2527621f023e49ca022394582c4085529a6e02e4514d6eccfe69bbe101c4ffa41ba9328df14155da6fe834db musl-fix-includes.patch"
diff --git a/main/f2fs-tools/musl-fix-includes.patch b/main/f2fs-tools/musl-fix-includes.patch
new file mode 100644
index 0000000000..1e13427b1f
--- /dev/null
+++ b/main/f2fs-tools/musl-fix-includes.patch
@@ -0,0 +1,10 @@
+--- f2fs-tools-1.2.0.orig/fsck/fibmap.c
++++ f2fs-tools-1.2.0/fsck/fibmap.c
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <linux/types.h>