[git] GnuPG - branch, master, updated. gnupg-2.1.19-38-g4b57359

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4 (commit)
      from  c22a2a89d3bd3d08b3abb8e4e33df32b480338ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4b57359ef3ce0b87e15889e12ef0fcd23f62dcb4
Author: Justus Winter <justus at g10code.com>
Date:   Tue Mar 7 15:20:19 2017 +0100

    build: Improve CFLAGS handling.
    
    * configure.ac: Strip any flags matching '-Werror' from CFLAGS before
    running the tests, and add them back later on.
    --
    Previously, the tests were run with empty CFLAGS.  This caused
    problems, e.g. on Fedora mmap was not detected due to some missing
    CFLAGS while running the tests.
    
    GnuPG-bug-id: 2423
    Fixes-commit: 02eb9fc9d5863abcfed6af704e618f8cac7cc2e8
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index 6d35450..8e2fc43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,12 +85,14 @@ AB_INIT
 
 AC_GNU_SOURCE
 
-# Before we do anything with the C compiler, we first save the user's
-# CFLAGS (they are restored at the end of the configure script).  This
-# is because some configure checks don't work with -Werror, but we'd
-# like to use -Werror with our build.
-CFLAGS_orig=$CFLAGS
-CFLAGS=
+# Before we do anything with the C compiler, we first split the user's
+# CFLAGS into two lists, one containing all flags matching '-Werror',
+# and the other one containing all remaing flags. They are recombined
+# at the end of the configure script.  This is because some configure
+# checks don't work with -Werror, but we'd like to use -Werror with
+# our build.
+CFLAGS_werror="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -e -Werror | tr '\n' ' ')"
+CFLAGS="$(echo $CFLAGS | tr '[[:space:]]' '\n' | grep -v -e -Werror | tr '\n' ' ')"
 
 # Some status variables.
 have_gpg_error=no
@@ -1676,7 +1678,7 @@ fi
 #
 # Add user CFLAGS.
 #
-CFLAGS="$CFLAGS $CFLAGS_orig"
+CFLAGS="$CFLAGS $CFLAGS_werror"
 
 #
 # Decide what to build

-----------------------------------------------------------------------

Summary of changes:
 configure.ac | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org