From a095ad4809fa6f1494464982c0605d0c2abaf70c Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 23 Sep 2012 18:24:36 +0200 Subject: system/zfs-fuse: Updated for version 20120201_6abfdcf. Added a patch for glibc>=2.14 Signed-off-by: Matteo Bernardini --- system/zfs-fuse/glibc-2.14.patch | 13 +++++++++++++ system/zfs-fuse/zfs-fuse.SlackBuild | 9 +++++++-- system/zfs-fuse/zfs-fuse.info | 6 +++--- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 system/zfs-fuse/glibc-2.14.patch diff --git a/system/zfs-fuse/glibc-2.14.patch b/system/zfs-fuse/glibc-2.14.patch new file mode 100644 index 0000000000..89345033ff --- /dev/null +++ b/system/zfs-fuse/glibc-2.14.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/libumem/malloc.c b/src/lib/libumem/malloc.c +index 7eec207..5a4d763 100644 +--- a/src/lib/libumem/malloc.c ++++ b/src/lib/libumem/malloc.c +@@ -453,7 +453,7 @@ static void __attribute__((constructor)) umem_malloc_init_hook(void) + } + } + +-void (*__malloc_initialize_hook)(void) = umem_malloc_init_hook; ++void (* __volatile __malloc_initialize_hook)(void) = umem_malloc_init_hook; + + #else + void __attribute__((constructor)) diff --git a/system/zfs-fuse/zfs-fuse.SlackBuild b/system/zfs-fuse/zfs-fuse.SlackBuild index 049c886fc4..5249af489d 100644 --- a/system/zfs-fuse/zfs-fuse.SlackBuild +++ b/system/zfs-fuse/zfs-fuse.SlackBuild @@ -3,9 +3,10 @@ # Slackware build script for ZFS-Fuse # Steven King revision date 2010/01/17 # Updated for 0.7.0 by rworkman on 20110403 +# Updated for 20120201_6abfdcf by ponce on 20120923 PRGNAM=zfs-fuse -VERSION=0.7.0 +VERSION=20120201_6abfdcf BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -28,11 +29,15 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# Patch for glib>=2.14 +# http://zfs-fuse.net/issues/137 +patch -p1 < $CWD/glibc-2.14.patch + cd src scons scons install install_dir=$PKG/usr/sbin diff --git a/system/zfs-fuse/zfs-fuse.info b/system/zfs-fuse/zfs-fuse.info index 86c3b0d71a..056e588e32 100644 --- a/system/zfs-fuse/zfs-fuse.info +++ b/system/zfs-fuse/zfs-fuse.info @@ -1,8 +1,8 @@ PRGNAM="zfs-fuse" -VERSION="0.7.0" +VERSION="20120201_6abfdcf" HOMEPAGE="http://zfs-fuse.net" -DOWNLOAD="http://zfs-fuse.net/releases/0.7.0/zfs-fuse-0.7.0.tar.bz2" -MD5SUM="789e51ded601da7ead9b609943de1ef8" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/zfs-fuse-20120201_6abfdcf.tar.xz" +MD5SUM="9f216b7148ed4a9b588ddf7d669bd17b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="scons" -- cgit v1.2.3