diff options
| -rw-r--r-- | main/fuse/APKBUILD | 9 | ||||
| -rw-r--r-- | main/fuse/fuse-iconv.patch | 33 |
2 files changed, 16 insertions, 26 deletions
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD index 10cd34ba53..d2e1dc1b02 100644 --- a/main/fuse/APKBUILD +++ b/main/fuse/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fuse -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=0 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." url="http://fuse.sourceforge.net/" @@ -26,6 +26,9 @@ prepare() { build() { cd "$_builddir" ./configure --prefix=/usr \ + --disable-static \ + --enable-shared \ + --disable-example \ --enable-lib \ --enable-util \ --bindir=/bin \ @@ -57,6 +60,6 @@ _EOF_ } -md5sums="a26ec54e410bb826a387947b10c0fd2c fuse-2.8.4.tar.gz -61db9e886d6f0a01ceca3731cba1f285 fuse-iconv.patch +md5sums="8aa2fd689de00b73963620483084ae3b fuse-2.8.5.tar.gz +1583e4e6f2213290ba47055c41114371 fuse-iconv.patch 5983726cfabf0830dffbbbf9a3abcddc fuse.initd" diff --git a/main/fuse/fuse-iconv.patch b/main/fuse/fuse-iconv.patch index 0f930ce93a..521dbbf73b 100644 --- a/main/fuse/fuse-iconv.patch +++ b/main/fuse/fuse-iconv.patch @@ -1,24 +1,11 @@ -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 7b19fc2..db8352e 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -11,8 +11,10 @@ else - mount_source = mount.c mount_util.c mount_util.h - endif +--- ./configure.in.orig ++++ ./configure.in +@@ -71,7 +71,7 @@ + done + ]) + AM_ICONV +-libfuse_libs="$libfuse_libs $LIBICONV" ++libfuse_libs="$libfuse_libs $LTLIBICONV" + AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes) + AC_SUBST(libfuse_libs) -+libfuse_la_LDFLAGS = - if ICONV - iconv_source = modules/iconv.c -+libfuse_la_LDFLAGS += -liconv - else - iconv_source = - endif -@@ -35,7 +37,7 @@ libfuse_la_SOURCES = \ - $(iconv_source) \ - $(mount_source) - --libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \ -+libfuse_la_LDFLAGS += @libfuse_libs@ -version-number 2:8:4 \ - -Wl,--version-script,$(srcdir)/fuse_versionscript - - libulockmgr_la_SOURCES = ulockmgr.c |