mergerfs: update to 2.31.0
[ci skip]
This commit is contained in:
parent
c24e7abac8
commit
e269e142cc
3 changed files with 37 additions and 23 deletions
32
srcpkgs/mergerfs/patches/0001-install_fix.patch
Normal file
32
srcpkgs/mergerfs/patches/0001-install_fix.patch
Normal file
|
@ -0,0 +1,32 @@
|
|||
From 584927af025144e4de064b6d274d3e99eec85993 Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Owens <ndowens@artixlinux.org>
|
||||
Date: Thu, 12 Nov 2020 18:58:23 -0600
|
||||
Subject: [PATCH] install_fix
|
||||
|
||||
---
|
||||
libfuse/Makefile | 9 ++-------
|
||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git libfuse/Makefile libfuse/Makefile
|
||||
index 61a1a11..99ccf9f 100644
|
||||
--- libfuse/Makefile
|
||||
+++ libfuse/Makefile
|
||||
@@ -106,13 +106,8 @@ strip:
|
||||
strip --strip-all build/mount.mergerfs
|
||||
strip --strip-all build/mergerfs-fusermount
|
||||
|
||||
-install-utils: mergerfs-fusermount mount.mergerfs strip
|
||||
- install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
|
||||
- install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
|
||||
- chown root "$(INSTALLBINDIR)/mergerfs-fusermount"
|
||||
- chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
|
||||
-
|
||||
-install: $(INSTALLUTILS)
|
||||
+install:
|
||||
+ echo ""
|
||||
|
||||
.PHONY: objects strip utils install install-utils
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
--- libfuse/Makefile 2020-02-23 04:40:32.000000000 +0100
|
||||
+++ libfuse/Makefile 2020-03-09 16:30:59.282571220 +0100
|
||||
@@ -93,11 +93,8 @@
|
||||
strip --strip-all build/mount.mergerfs
|
||||
strip --strip-all build/mergerfs-fusermount
|
||||
|
||||
-install: mergerfs-fusermount mount.mergerfs strip
|
||||
- install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
|
||||
- install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
|
||||
- chown root:root "$(INSTALLBINDIR)/mergerfs-fusermount"
|
||||
- chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
|
||||
+install:
|
||||
+ echo "---------"
|
||||
|
||||
.PHONY: objects strip
|
||||
|
|
@ -1,23 +1,21 @@
|
|||
# Template file for 'mergerfs'
|
||||
pkgname=mergerfs
|
||||
version=2.29.0
|
||||
version=2.31.0
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
make_use_env=yes
|
||||
hostmakedepends="automake libtool pkg-config which"
|
||||
makedepends="fuse-devel"
|
||||
short_desc="FUSE union filesystem"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="ISC"
|
||||
homepage="https://github.com/trapexit/mergerfs"
|
||||
distfiles="${homepage}/archive/${version}.tar.gz"
|
||||
checksum=f16f7c90d9db35b9f8fadbb529c4bf0f7d65d18fd2e7443a662cbfa7a8dbd4f9
|
||||
checksum=753cee325b333eebd448795e2702f50b24b24e12a86c547fe8eceff4b3311cd4
|
||||
|
||||
pre_build() {
|
||||
vsed -i 's|^CXXFLAGS[[:blank:]]*=|override CXXFLAGS +=|g' Makefile
|
||||
vsed -i 's|^LDFLAGS[[:blank:]]*=|override LDFLAGS +=|g' Makefile
|
||||
|
||||
# we build from source, spoof release tarball
|
||||
echo "$version" > VERSION
|
||||
./tools/update-version
|
||||
vsed -i "s|^VERSION=.*|VERSION=$pkgver|" tools/update-version
|
||||
}
|
||||
|
||||
post_install() {
|
||||
|
|
Loading…
Reference in a new issue