diff options
| author | Nathan Caldwell <saintdev@gmail.com> | 2019-05-21 00:59:57 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-06-02 21:25:02 +0000 |
| commit | 1829dbc40eaa67cc12cc9ef5072a1aa6149c0815 (patch) | |
| tree | b5bfc537e15f4f1ddc31a1be88bdfb30b0197984 | |
| parent | 1aa76bb0ca302ba4bf61736e1bb7bd12a6a226f6 (diff) | |
| download | aports-1829dbc40eaa67cc12cc9ef5072a1aa6149c0815.tar.bz2 aports-1829dbc40eaa67cc12cc9ef5072a1aa6149c0815.tar.xz | |
testing/mergerfs: upgrade to 2.27.0
Closes GH-7978
| -rw-r--r-- | testing/mergerfs/APKBUILD | 15 | ||||
| -rw-r--r-- | testing/mergerfs/makefile-no-debug.patch | 11 |
2 files changed, 7 insertions, 19 deletions
diff --git a/testing/mergerfs/APKBUILD b/testing/mergerfs/APKBUILD index 7625190ed9..b0f9979cec 100644 --- a/testing/mergerfs/APKBUILD +++ b/testing/mergerfs/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Nathan Caldwell <saintdev@gmail.com> # Maintainer: Nathan Caldwell <saintdev@gmail.com> -# TODO: Build against system-provided libfuse, don't use bundled libfuse. +# NOTE: For now we must use vendored libfuse, see the URL below for details. +# https://github.com/trapexit/mergerfs/blob/2.27.0/README.md#why-was-libfuse-embedded-into-mergerfs pkgname=mergerfs -pkgver=2.24.2 +pkgver=2.27.0 pkgrel=0 pkgdesc="A FUSE based union filesystem" url="https://github.com/trapexit/mergerfs" arch="all" license="ISC" depends="libattr fuse" -makedepends="autoconf automake libtool gettext-dev attr-dev fuse-dev linux-headers" +makedepends="autoconf automake libtool gettext-dev attr-dev linux-headers" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/trapexit/$pkgname/archive/$pkgver.tar.gz - makefile-no-debug.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/trapexit/$pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -26,7 +26,7 @@ build() { } check() { - cd "$builddir" + cd "$builddir"/build # Both --version and --help exists with 1... ./mergerfs --version | grep 'mergerfs version' @@ -37,5 +37,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="a2a66ed95936e00aee9148267acec8687f3b106cefa0fe59337f10ce6bf543afa109cd889c6949b38bb87bb26b38ab2d67d9dac2a022a82fb152f368ddfe68a6 mergerfs-2.24.2.tar.gz -1836bbfc38d167d0107fdb1b29630625d4eec0ce3e505d48df1fcb8fc9122e55522535a7f45c9db51e9b66a43af7293eb9c684fd4faec5ced2ba2140c2615c5e makefile-no-debug.patch" +sha512sums="d6de527795fec31bac948e2606140463b9912f53a4f565ae2a1305c67a8ec3ad943a6fe7445d584135e4646e1bd282aa5683dc12d35d89b3e575f4c39a599948 mergerfs-2.27.0.tar.gz" diff --git a/testing/mergerfs/makefile-no-debug.patch b/testing/mergerfs/makefile-no-debug.patch deleted file mode 100644 index 02b93cb786..0000000000 --- a/testing/mergerfs/makefile-no-debug.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ - TARGET = mergerfs - MANPAGE = $(TARGET).1 - FUSE_CFLAGS = -D_FILE_OFFSET_BITS=64 -Ilibfuse/include --CFLAGS = -g -Wall \ -+CFLAGS = -Wall \ - $(OPTS) \ - -Wno-unused-result \ - $(FUSE_CFLAGS) \ |