diff --git a/0001-build-restore-ability-to-control-verbosity-settings.patch b/0001-build-restore-ability-to-control-verbosity-settings.patch new file mode 100644 index 0000000..e7adfb4 --- /dev/null +++ b/0001-build-restore-ability-to-control-verbosity-settings.patch @@ -0,0 +1,40 @@ +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.changes b/glusterfs.changes index 54fadde..feb8eb8 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 14 18:47:07 UTC 2017 - jengelh@inai.de + +- Add 0001-build-restore-ability-to-control-verbosity-settings.patch +- Replace xdr_sizeof.c with an empty file + ------------------------------------------------------------------- Mon Dec 4 14:03:38 UTC 2017 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index b4c48d9..ce29217 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -27,6 +27,7 @@ Url: http://www.gluster.org/ #Git-Clone: git://github.com/fvzwieten/lsgvt Source: https://download.gluster.org/pub/gluster/glusterfs/3.12/3.12.3/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 @@ -141,7 +142,8 @@ links. %prep %setup -q -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 +>contrib/sunrpc/xdr_sizeof.c %build ./autogen.sh @@ -149,6 +151,7 @@ links. --disable-static \ --disable-silent-rules make %{?_smp_mflags} +find . -name 'xdr_sizeof*' -type f -exec ls -lgo {} + || : %install %make_install docdir="%_docdir/%name"