grep branch, master, updated. v2.20-85-gcae0ef2

[Paul Eggert]

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 "grep".

The branch, master has been updated
       via  cae0ef2fcd4786583cda8e0c283cad79a5d33918 (commit)
      from  2f3efcdf47b8442fdb31a3c9f08def2d04c80dec (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=cae0ef2fcd4786583cda8e0c283cad79a5d33918


commit cae0ef2fcd4786583cda8e0c283cad79a5d33918
Author: Paul Eggert <address@hidden>
Date:   Tue Nov 11 20:21:48 2014 -0800

    build: port to GCC 4.6.4 + glibc 2.5
    
    On platforms this old, building with _FORTIFY_SOURCE equal to 2
    results in duplicate definitions of standard library functions.
    Problem reported by Nelson H. F. Beebe.
    * configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK.
    By default, do not enable this unless GNULIB_PORTCHECK is defined.
    This better matches the original intent, which as I recall was to
    enable these extra checks only with --enable-gcc-warnings.

diff --git a/configure.ac b/configure.ac
index 4d069b8..0b548bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,14 +144,15 @@ if test "$gl_gcc_warnings" = yes; then
   AC_SUBST([WARN_CFLAGS])
 
   AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
-  AH_VERBATIM([FORTIFY_SOURCE],
+  AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
+  AH_VERBATIM([GNULIB_PORTCHECK_FORTIFY_SOURCE],
   [/* Enable compile-time and run-time bounds-checking, and some warnings,
       without upsetting glibc 2.15+. */
-   #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
+   #if (defined GNULIB_PORTCHECK && !defined _FORTIFY_SOURCE \
+        && defined __OPTIMIZE__ && __OPTIMIZE__)
    # define _FORTIFY_SOURCE 2
    #endif
   ])
-  AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
 
   # We use a slightly smaller set of warning options for lib/.
   # Remove the following and save the result in GNULIB_WARN_CFLAGS.

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

Summary of changes:
 configure.ac |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep