gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

sys-cluster/glusterfs: remove unused patches

Browse Source 
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11710
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
2019-04-16 19:45:29 +02:00
committed by Alexys Jacob
parent ceec3140f1
commit 4b11c1f5a6
3 changed files with 0 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
View File

@@ -1,22 +0,0 @@
--- a/configure.ac 2017-08-30 13:46:34.075359703 +0100
+++ b/configure.ac 2017-09-07 21:28:48.110879291 +0100
@@ -19,19 +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
-
-if make --help 2>&1 | grep -q quiet; then
- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
-fi
-
-if libtool --help 2>&1 | grep -q quiet; then
- AM_LIBTOOLFLAGS="--quiet";
-fi
AC_CONFIG_HEADERS([config.h site.h])

48
sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
View File

@@ -1,48 +0,0 @@
From 1e1c3cc0761879e8a2e4d4a884dacc555bbe7fa0 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Fri, 9 Mar 2018 23:06:43 +0000
Subject: [PATCH 2/2] build: Fix misleading TIRPC result in configure summary
Requesting ipv6-default even if you explicitly disable libtirpc will
then implicitly enable libtirpc because that is required. That is fine
but the configure summary should not then show TIRPC as disabled when
it is not.
The result has also been made clearer by stating that TIRPC is
"missing" when it has been tried but not found.
BUG: 1553938
Change-Id: I945bd6859aaf3defa682b0d05ee34a9827b9c45f
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
configure.ac | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index d42179182..9571dac76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1097,16 +1097,15 @@ AC_SUBST(GF_DISTRIBUTION)
GF_HOST_OS=""
GF_LDFLAGS="-rdynamic"
-DISABLE_LIBTIRPC=no
dnl include tirpc for IPv6 builds
if test "x$with_libtirpc" = "xyes" || test "x$with_ipv6_default" = "xyes" ; then
PKG_CHECK_MODULES([TIRPC], [libtirpc],
- [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
- [DISABLE_LIBTIRPC=yes])
+ [with_libtirpc=yes; GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
+ [with_libtirpc=missing])
fi
-if test "x$DISABLE_LIBTIRPC" = "xyes" ; then
- with_libtirpc=no; with_ipv6_default=no
+if test "x$with_libtirpc" = "xmissing" ; then
+ with_ipv6_default=no
AC_CHECK_HEADERS([rpc/rpc.h],[
AC_MSG_WARN([
---------------------------------------------------------------------------------
--
2.16.1

38
sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
View File

@@ -1,38 +0,0 @@
From c77b8f23af7d285fd82dbd3e4db3fa2c09899e58 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Fri, 9 Mar 2018 22:39:41 +0000
Subject: [PATCH 1/2] build: Fix configure --without-ipv6-default behaviour
The current behaviour disables ipv6-default when no switch is given at
all but otherwise checks if libtirpc was requested, regardless of
whether you have given --with-ipv6-default or --without-ipv6-default.
I believe the intention was to enable when libtirpc is requested by
default but otherwise respect the switch given.
This is important because ipv6-default breaks Gluster for systems that
have IPv6 disabled.
BUG: 1553926
Change-Id: I76b91ae2699574b2e5b777453732bb5cbd79bbca
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 827ec0518..d42179182 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,7 +315,7 @@ AC_ARG_WITH([libtirpc],
AC_ARG_WITH([ipv6-default],
AC_HELP_STRING([--with-ipv6-default], [Set IPv6 as default.]),
- [with_ipv6_default=$with_libtirpc], [with_ipv6_default=no])
+ [], [with_ipv6_default=$with_libtirpc])
if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
if rpm -qa centos-release | grep centos; then
--
2.16.1