| 1 |
commit: 95ebf1ace930eb97490b38f78208085903786ca6 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 11:05:01 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 26 11:07:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ebf1ac |
| 7 |
|
| 8 |
sys-cluster/glusterfs: Update 9999 to fix IPv6/TIRPC |
| 9 |
|
| 10 |
I've given up fighting with upstream over this. :( |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 13 |
|
| 14 |
sys-cluster/glusterfs/glusterfs-9999.ebuild | 10 ++++++---- |
| 15 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild |
| 18 |
index c48c92ed2f0..3284a29382b 100644 |
| 19 |
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild |
| 20 |
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild |
| 21 |
@@ -67,8 +67,6 @@ SITEFILE="50${PN}-mode-gentoo.el" |
| 22 |
PATCHES=( |
| 23 |
"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch" |
| 24 |
"${FILESDIR}/${PN}-4.1.0-silent_rules.patch" |
| 25 |
- "${FILESDIR}/${PN}-without-ipv6-default.patch" |
| 26 |
- "${FILESDIR}/${PN}-TIRPC-config-summary.patch" |
| 27 |
) |
| 28 |
|
| 29 |
DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) |
| 30 |
@@ -102,6 +100,10 @@ src_prepare() { |
| 31 |
} |
| 32 |
|
| 33 |
src_configure() { |
| 34 |
+ # --without-ipv6-default and --with-libtirpc don't do what you they |
| 35 |
+ # do. Chewi has given up fighting with upstream about this. |
| 36 |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1553926 |
| 37 |
+ |
| 38 |
econf \ |
| 39 |
--disable-dependency-tracking \ |
| 40 |
--disable-silent-rules \ |
| 41 |
@@ -120,8 +122,8 @@ src_configure() { |
| 42 |
$(use_enable test cmocka) \ |
| 43 |
$(use_enable tiering) \ |
| 44 |
$(use_enable xml xml-output) \ |
| 45 |
- $(use_with ipv6 ipv6-default) \ |
| 46 |
- $(use_with libtirpc) \ |
| 47 |
+ $(use libtirpc || echo --without-libtirpc) \ |
| 48 |
+ $(use ipv6 && echo --with-ipv6-default) \ |
| 49 |
--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ |
| 50 |
--docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 51 |
--localstatedir="${EPREFIX}"/var |
Archives