summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2018-03-08 23:02:34 +0000
committerJames Le Cuirot <chewi@gentoo.org>2018-03-08 23:06:12 +0000
commit8367c70f19adaadfc5bf86786e02b5a11dfc093f (patch)
tree5b6753fdc221ff19f81fac3727bc2f5fb3f34d1d /sys-cluster
parentdev-db/sqlite: stable 3.22.0 for ia64, bug #649954 (diff)
downloadgentoo-8367c70f19adaadfc5bf86786e02b5a11dfc093f.tar.gz
gentoo-8367c70f19adaadfc5bf86786e02b5a11dfc093f.tar.bz2
gentoo-8367c70f19adaadfc5bf86786e02b5a11dfc093f.zip
sys-cluster/glusterfs: Update 9999 with new silent rules patch
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch15
-rw-r--r--sys-cluster/glusterfs/glusterfs-9999.ebuild6
2 files changed, 18 insertions, 3 deletions
diff --git a/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch
new file mode 100644
index 000000000000..236898ab8c14
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-4.1.0-silent_rules.patch
@@ -0,0 +1,15 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2018-03-08 22:50:23.221758897 +0000
++++ b/configure.ac 2018-03-08 22:53:12.776129757 +0000
+@@ -19,11 +19,6 @@
+ #but libglusterfs fails to build with contrib (Then are not set up that way?)
+ #AM_INIT_AUTOMAKE([subdir-objects])
+
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
+-
+-if make --help 2>&1 | grep -q no-print-directory; then
+- AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
+-fi
+
+ AC_CONFIG_HEADERS([config.h site.h])
+
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 4615e8fa7565..2733e7788033 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -65,7 +65,7 @@ SITEFILE="50${PN}-mode-gentoo.el"
PATCHES=(
"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
- "${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
+ "${FILESDIR}/${PN}-4.1.0-silent_rules.patch"
)
DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -178,7 +178,7 @@ src_install() {
newconfd "${FILESDIR}/${PN}.confd" glusterfsd
keepdir /var/log/${PN}
- keepdir /var/lib/glusterd
+ keepdir /var/lib/glusterd/{events,glusterfind/.keys}
# QA
rm -r "${ED}/var/run/" || die