aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-11-01 21:41:48 +0100
committerJakub Jirutka <jakub@jirutka.cz>2017-11-01 21:49:07 +0100
commit2f90459c07ea6ba543481090d65d9a4ae7c7c6d0 (patch)
tree6623909a6e54dd4c36e49e0d506e44d7106a16cc /testing
parent5d63e497d18fb43a99c2e2ddb881892db64670b8 (diff)
downloadaports-2f90459c07ea6ba543481090d65d9a4ae7c7c6d0.tar.bz2
aports-2f90459c07ea6ba543481090d65d9a4ae7c7c6d0.tar.xz
testing/mergerfs: fix --version and build without -g
Makefile sets mergerfs version based on git tag, but we're in aports repository...
Diffstat (limited to 'testing')
-rw-r--r--testing/mergerfs/APKBUILD13
-rw-r--r--testing/mergerfs/makefile-no-debug.patch11
2 files changed, 21 insertions, 3 deletions
diff --git a/testing/mergerfs/APKBUILD b/testing/mergerfs/APKBUILD
index 511a39c721..443da354e4 100644
--- a/testing/mergerfs/APKBUILD
+++ b/testing/mergerfs/APKBUILD
@@ -10,12 +10,18 @@ license="ISC"
depends="libattr fuse"
makedepends="autoconf automake libtool gettext-dev attr-dev fuse-dev linux-headers"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/trapexit/$pkgname/archive/$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/trapexit/$pkgname/archive/$pkgver.tar.gz
+ makefile-no-debug.patch"
builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+ default_prepare
+ echo "$pkgver" > "$builddir"/VERSION
+}
+
build() {
cd "$builddir"
- make OPTS="$CXXFLAGS"
+ make OPTS="$CXXFLAGS" GIT=
}
check() {
@@ -30,4 +36,5 @@ package() {
make PREFIX="/usr" DESTDIR="$pkgdir" install
}
-sha512sums="1f2ecb162bd2aee390d5067a888f38c0b7137022f7447b93ff2b743d759b815408f6f09e68bcf240e5274d6c872b9a8c9cbe48b5e11538ae0af02713a4f66745 mergerfs-2.23.1.tar.gz"
+sha512sums="1f2ecb162bd2aee390d5067a888f38c0b7137022f7447b93ff2b743d759b815408f6f09e68bcf240e5274d6c872b9a8c9cbe48b5e11538ae0af02713a4f66745 mergerfs-2.23.1.tar.gz
+1836bbfc38d167d0107fdb1b29630625d4eec0ce3e505d48df1fcb8fc9122e55522535a7f45c9db51e9b66a43af7293eb9c684fd4faec5ced2ba2140c2615c5e makefile-no-debug.patch"
diff --git a/testing/mergerfs/makefile-no-debug.patch b/testing/mergerfs/makefile-no-debug.patch
new file mode 100644
index 0000000000..02b93cb786
--- /dev/null
+++ b/testing/mergerfs/makefile-no-debug.patch
@@ -0,0 +1,11 @@
+--- 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) \