aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-08-09 12:52:09 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-08-09 12:52:09 +0000
commit829f9b953a2cf09914b5ec99ecc128a1c86015a9 (patch)
tree4cfcaee448dd823fb2569478239dbc1be934cdce /main
parentbdcc6ff286e16dbaedc51c1be2e5778f0d1eb0eb (diff)
downloadaports-829f9b953a2cf09914b5ec99ecc128a1c86015a9.tar.bz2
aports-829f9b953a2cf09914b5ec99ecc128a1c86015a9.tar.xz
main/fuse: fix iconv linking
Diffstat (limited to 'main')
-rw-r--r--main/fuse/APKBUILD10
-rw-r--r--main/fuse/fuse-iconv.patch4
2 files changed, 11 insertions, 3 deletions
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index 0f3de16b27..51e361a201 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fuse
pkgver=2.9.1
-pkgrel=0
+pkgrel=1
pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
url="http://fuse.sourceforge.net/"
arch="all"
@@ -12,6 +12,7 @@ makedepends="pkgconfig libiconv-dev gettext-dev
install=
subpackages="$pkgname-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+ fuse-iconv.patch
fuse.initd"
@@ -19,6 +20,12 @@ _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
+ libtoolize --force && aclocal && autoconf && automake || return 1
}
build() {
@@ -59,4 +66,5 @@ _EOF_
}
md5sums="c646133c7bbf8ad9d2ced0888dc4a319 fuse-2.9.1.tar.gz
+56f745753537b2d7a24aa2273906455e fuse-iconv.patch
5983726cfabf0830dffbbbf9a3abcddc fuse.initd"
diff --git a/main/fuse/fuse-iconv.patch b/main/fuse/fuse-iconv.patch
index 521dbbf73b..7eaa1563df 100644
--- a/main/fuse/fuse-iconv.patch
+++ b/main/fuse/fuse-iconv.patch
@@ -1,10 +1,10 @@
--- ./configure.in.orig
+++ ./configure.in
-@@ -71,7 +71,7 @@
+@@ -70,7 +70,7 @@
done
])
AM_ICONV
--libfuse_libs="$libfuse_libs $LIBICONV"
+-libfuse_libs=$libfuse_libs $LTLIBICONV
+libfuse_libs="$libfuse_libs $LTLIBICONV"
AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
AC_SUBST(libfuse_libs)