jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mergerfs: update to 2.24.2.

Browse source 
Closes #14359.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
maxice8 2018-05-13 04:37:26 -03:00 committed by Enno Boland
parent e7a5b19e00
commit 45496516a4
No known key found for this signature in database
GPG key ID: D09964719BDE9971
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/mergerfs/patches/system-fuse.patch
View file

@ -1,13 +1,13 @@
--- Makefile.orig 2017-06-04 20:12:49.459463768 +0200 --- Makefile
+++ Makefile 2017-06-04 20:14:04.535236799 +0200 +++ Makefile
@@ -77,9 +77,8 @@ help: @@ -84,9 +84,8 @@ help:
@echo "usage: make" @echo "usage: make"
@echo "make XATTR_AVAILABLE=0 - to build program without xattrs functionality (auto discovered otherwise)" @echo "make XATTR_AVAILABLE=0 - to build program without xattrs functionality (auto discovered otherwise)"
-$(TARGET): src/version.hpp obj/obj-stamp libfuse/lib/.libs/libfuse.a $(OBJ) -$(TARGET): version obj/obj-stamp libfuse/lib/.libs/libfuse.a $(OBJ)
- cd libfuse && make - cd libfuse && make
- $(CXX) $(CFLAGS) $(OBJ) -o $@ libfuse/lib/.libs/libfuse.a -ldl $(LDFLAGS) - $(CXX) $(CFLAGS) $(OBJ) -o $@ libfuse/lib/.libs/libfuse.a -ldl $(LDFLAGS)
+$(TARGET): src/version.hpp obj/obj-stamp $(OBJ) +$(TARGET): version obj/obj-stamp $(OBJ)
+ $(CXX) $(CFLAGS) $(OBJ) -o $@ -lfuse -ldl $(LDFLAGS) + $(CXX) $(CFLAGS) $(OBJ) -o $@ -lfuse -ldl $(LDFLAGS)
mount.mergerfs: $(TARGET) mount.mergerfs: $(TARGET)

20
srcpkgs/mergerfs/template
View file

@ -1,27 +1,23 @@
# Template file for 'mergerfs' # Template file for 'mergerfs'
pkgname="mergerfs" pkgname=mergerfs
version=2.23.1 version=2.24.2
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
makedepends="fuse-devel attr-devel" hostmakedepends="automake libtool pandoc pkg-config"
hostmakedepends="automake libtool pkg-config" makedepends="attr-devel fuse-devel"
short_desc="FUSE union filesystem" short_desc="FUSE union filesystem"
maintainer="Orphaned <orphan@voidlinux.eu>" maintainer="Orphaned <orphan@voidlinux.eu>"
license="ISC" license="ISC"
homepage="https://github.com/trapexit/mergerfs" homepage="https://github.com/trapexit/mergerfs"
distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz"
checksum=f38c3909c7145d291fa4cb85241f488efc01000ec9657a3cf72ee6ab4400c733 checksum=bd0c9e5962361aae1040f341ebe05fe4ceef7c503e17e03d73b572643bfdfbfd
case "$XBPS_TARGET_MACHINE" in
*-musl) # Does not have pandoc
;;
*) hostmakedepends+=" pandoc"
;;
esac
pre_build() { pre_build() {
sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile
sed -i 's|^LDFLAGS[[:blank:]]*=|override LDFLAGS +=|g' Makefile sed -i 's|^LDFLAGS[[:blank:]]*=|override LDFLAGS +=|g' Makefile
echo "#pragma once" > src/version.hpp
echo "static const char MERGERFS_VERSION[] = \"${version}\";" >> src/version.hpp
} }
post_install() { post_install() {