diff --git a/0001-build-restore-ability-to-control-verbosity-settings.patch b/0001-build-restore-ability-to-control-verbosity-settings.patch deleted file mode 100644 index e7adfb4..0000000 --- a/0001-build-restore-ability-to-control-verbosity-settings.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d2a7297a226155ff9b0696ca04480f4e9f3bd6bc Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 14 Dec 2017 19:43:43 +0100 -Subject: [PATCH] build: restore ability to control verbosity settings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -References: https://github.com/gluster/glusterfs/pull/381 - -`make V=1` is broken — no commands are printed whatsoever. At the -same time, `make V=0` *also* is broken in that no summary lines -("CC  foo.o") are printed, either. Kill the annoying hardcoded ---quiet in configure.ac, since it seems to override everything that -automake offers. ---- - configure.ac | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 81c56d4e6..ed11f35e4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,14 +25,6 @@ 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]) - - AC_CONFIG_FILES([Makefile --- -2.15.1 - diff --git a/glusterfs-tirpc.diff b/glusterfs-tirpc.diff deleted file mode 100644 index b63b478..0000000 --- a/glusterfs-tirpc.diff +++ /dev/null @@ -1,35 +0,0 @@ -From: kukuk@suse.de -Date: Mon Nov 13 07:49:33 CET 2017 - -Fall back to libtirpc if there is no sunrpc support in glibc. - ---- - configure.ac | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -Index: glusterfs-3.12.3/configure.ac -=================================================================== ---- glusterfs-3.12.3.orig/configure.ac -+++ glusterfs-3.12.3/configure.ac -@@ -431,6 +431,21 @@ AC_CHECK_HEADERS([openssl/dh.h]) - - AC_CHECK_HEADERS([openssl/ecdh.h]) - -+dnl RPC library -+AC_CHECK_FUNC([xdrmem_create],[], AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl tirpc])) -+dnl Cygwin/recent glibc requires -I/usr/include/tirpc for -+old_CFLAGS=$CFLAGS -+AC_CACHE_CHECK([where to find ], [lv_cv_xdr_cflags], [ -+ for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do -+ if test x"$add_CFLAGS" = xmissing; then -+ lv_cv_xdr_cflags=missing; break -+ fi -+ CFLAGS="$old_CFLAGS $add_CFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+ ]])], [lv_cv_xdr_cflags=${add_CFLAGS:-none}; break]) -+ done -+]) -+ - dnl Math library - AC_CHECK_LIB([m], [pow], [MATH_LIB='-lm'], [MATH_LIB='']) - AC_SUBST(MATH_LIB) diff --git a/glusterfs.spec b/glusterfs.spec index 9028dff..3280618 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -27,8 +27,6 @@ Url: http://www.gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/fvzwieten/lsgvt Source: https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.2/glusterfs-%version.tar.gz -#Patch1: glusterfs-tirpc.diff -#Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch BuildRequires: acl-devel BuildRequires: autoconf BuildRequires: automake