fuse: add patches from sabotage for musl.

This commit is contained in:
Juan RP 2014-01-11 12:04:28 +01:00
parent 20807e83aa
commit a6d77c71b7
4 changed files with 57 additions and 14 deletions

View File

@ -0,0 +1,13 @@
--- include/fuse_common.h
+++ include/fuse_common.h
@@ -28,8 +28,8 @@
#define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min))
#define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)
-/* This interface uses 64 bit off_t */
-#if _FILE_OFFSET_BITS != 64
+/* This interface uses 64 bit off_t, and only glibc has an implementation with 2 different sizes */
+#if defined(__GLIBC__) && _FILE_OFFSET_BITS != 64
#error Please add -D_FILE_OFFSET_BITS=64 to your compile flags!
#endif

View File

@ -0,0 +1,20 @@
--- lib/fuse_lowlevel.c
+++ lib/fuse_lowlevel.c
@@ -24,6 +24,7 @@
#include <limits.h>
#include <errno.h>
#include <assert.h>
+#include <sys/file.h>
#ifndef F_LINUX_SPECIFIC_BASE
#define F_LINUX_SPECIFIC_BASE 1024
--- lib/fuse.c
+++ lib/fuse.c
@@ -37,6 +37,7 @@
#include <sys/uio.h>
#include <sys/time.h>
#include <sys/mman.h>
+#include <sys/file.h>
#define FUSE_NODE_SLAB 1

View File

@ -0,0 +1,20 @@
--- lib/mount_util.c
+++ lib/mount_util.c
@@ -16,6 +16,7 @@
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
+#include <paths.h>
#ifndef __NetBSD__
#include <mntent.h>
#endif
--- util/fusermount.c
+++ util/fusermount.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <fcntl.h>
#include <pwd.h>
+#include <paths.h>
#include <mntent.h>
#include <sys/wait.h>
#include <sys/stat.h>

View File

@ -1,26 +1,15 @@
# Template file for 'fuse' # Template file for 'fuse'
pkgname=fuse pkgname=fuse
version=2.9.3 version=2.9.3
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-static --enable-lib --enable-util" configure_args="--enable-lib --enable-util"
short_desc="Filesystem in Userspace" short_desc="Filesystem in Userspace"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"
homepage="http://fuse.sourceforge.net" homepage="http://fuse.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c checksum=0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c
long_desc="
With FUSE it is possible to implement a fully functional filesystem in
a userspace program. Features include:
* Simple library API
* Simple installation (no need to patch or recompile the kernel)
* Secure implementation
* Userspace - kernel interface is very efficient
* Usable by non privileged users
* Runs on Linux kernels 2.4.X and 2.6.X
* Has proven very stable over time"
post_install() { post_install() {
# remove obsolete rules file provided by udev. # remove obsolete rules file provided by udev.
@ -31,11 +20,12 @@ post_install() {
} }
fuse-devel_package() { fuse-devel_package() {
depends="fuse-${version}_${revision}" depends="fuse>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
} }
} }