aboutsummaryrefslogtreecommitdiffstats
path: root/main/jfsutils
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-17 13:59:36 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-17 13:59:36 +0000
commitd9768c312ddc047df6c2c9b1674b2ab37ddf4e2a (patch)
tree11bb55dee30c54df4d5789a2aaf036294999eff4 /main/jfsutils
parenta88e28c7c3e258b29a40c39e3dd73d4f32e2e460 (diff)
downloadaports-d9768c312ddc047df6c2c9b1674b2ab37ddf4e2a.tar.bz2
aports-d9768c312ddc047df6c2c9b1674b2ab37ddf4e2a.tar.xz
main/jfsutils: fix musl build
Diffstat (limited to 'main/jfsutils')
-rw-r--r--main/jfsutils/APKBUILD10
-rw-r--r--main/jfsutils/musl-fix-includes.patch18
2 files changed, 27 insertions, 1 deletions
diff --git a/main/jfsutils/APKBUILD b/main/jfsutils/APKBUILD
index f14ad8668b..23b12b0f2a 100644
--- a/main/jfsutils/APKBUILD
+++ b/main/jfsutils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=jfsutils
pkgver=1.1.15
-pkgrel=0
+pkgrel=1
pkgdesc="JFS filesystem utilities"
url="http://jfs.sourceforge.net"
arch="all"
@@ -12,6 +12,7 @@ install=
makedepends="e2fsprogs-dev" # pkgconfig is pulled in externally.
subpackages="$pkgname-doc"
source="http://jfs.sourceforge.net/project/pub/jfsutils-$pkgver.tar.gz
+ musl-fix-includes.patch
missing-stdinth.patch"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -43,4 +44,11 @@ package() {
}
md5sums="8809465cd48a202895bc2a12e1923b5d jfsutils-1.1.15.tar.gz
+cd086dc5682094b81c25fa64ed820aca musl-fix-includes.patch
da6e6be4d89d5652d9c1e99424634e42 missing-stdinth.patch"
+sha256sums="244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d jfsutils-1.1.15.tar.gz
+163754388fb2f8c7525b14d1f9cb07e35b91d0ff8f5964df20c3f042305f42d4 musl-fix-includes.patch
+cabb017038bccfcec5ff55b820105b1fefe679c122a03f2d186f5be8e33ca4d7 missing-stdinth.patch"
+sha512sums="fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858 jfsutils-1.1.15.tar.gz
+fb0d7348e2e13a6a9c3a987d161e0cf05363649515366ef49a45e3580b8f6135fce8465b99ff8a351231d970371c00bea6ceb9edb1d0f24da20d261b06ec85bd musl-fix-includes.patch
+a8e2332f2dec37affa8404b31e7e68399d815d450422ad342243c51d117e4d7ef4aaa0e30d1389380a81ed076a7ef1e1d41fcf260fa05ce4d823aa779628982d missing-stdinth.patch"
diff --git a/main/jfsutils/musl-fix-includes.patch b/main/jfsutils/musl-fix-includes.patch
new file mode 100644
index 0000000000..33ba55d795
--- /dev/null
+++ b/main/jfsutils/musl-fix-includes.patch
@@ -0,0 +1,18 @@
+--- jfsutils-1.1.15.orig/libfs/fssubs.c
++++ jfsutils-1.1.15/libfs/fssubs.c
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <paths.h>
+
+ #if HAVE_MNTENT_H
+ #include <mntent.h>
+@@ -31,7 +32,6 @@
+ #endif
+
+ #if HAVE_GETMNTINFO
+-#include <paths.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #endif