summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2018-05-26 12:05:01 +0100
committerJames Le Cuirot <chewi@gentoo.org>2018-05-26 12:07:29 +0100
commit95ebf1ace930eb97490b38f78208085903786ca6 (patch)
tree2900a95f3ba1eef2d3f732c82fbc7831f7de06ea
parentsys-cluster/glusterfs: Version bump to 4.0.2 (diff)
downloadgentoo-95ebf1ace930eb97490b38f78208085903786ca6.tar.gz
gentoo-95ebf1ace930eb97490b38f78208085903786ca6.tar.bz2
gentoo-95ebf1ace930eb97490b38f78208085903786ca6.zip
sys-cluster/glusterfs: Update 9999 to fix IPv6/TIRPC
I've given up fighting with upstream over this. :( Package-Manager: Portage-2.3.40, Repoman-2.3.9
-rw-r--r--sys-cluster/glusterfs/glusterfs-9999.ebuild10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index c48c92ed2f03..3284a29382b8 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -67,8 +67,6 @@ SITEFILE="50${PN}-mode-gentoo.el"
PATCHES=(
"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
"${FILESDIR}/${PN}-4.1.0-silent_rules.patch"
- "${FILESDIR}/${PN}-without-ipv6-default.patch"
- "${FILESDIR}/${PN}-TIRPC-config-summary.patch"
)
DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -102,6 +100,10 @@ src_prepare() {
}
src_configure() {
+ # --without-ipv6-default and --with-libtirpc don't do what you they
+ # do. Chewi has given up fighting with upstream about this.
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1553926
+
econf \
--disable-dependency-tracking \
--disable-silent-rules \
@@ -120,8 +122,8 @@ src_configure() {
$(use_enable test cmocka) \
$(use_enable tiering) \
$(use_enable xml xml-output) \
- $(use_with ipv6 ipv6-default) \
- $(use_with libtirpc) \
+ $(use libtirpc || echo --without-libtirpc) \
+ $(use ipv6 && echo --with-ipv6-default) \
--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--localstatedir="${EPREFIX}"/var