From: Eric Blake <eblake@redhat.com>
Date: Fri, 31 Aug 2012 19:07:54 +0000 (-0700)
Subject: build: work with new glibc when not optimizing
X-Git-Tag: v8.20~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=314457b2aed274984425d3156a8e2fb76662ea24;p=thirdparty%2Fcoreutils.git

build: work with new glibc when not optimizing

Starting with glibc 2.15, the system headers refuse to compile
unconditional use of FORTIFY_SOURCE if optimization is disabled
but -Werror is in effect.

* configure.ac (FORTIFY_SOURCE): Make conditional.
---

diff --git a/configure.ac b/configure.ac
index 083fd34910..f93e65e9b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,8 +162,13 @@ 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.])
-  AC_DEFINE([_FORTIFY_SOURCE], [2],
-    [enable compile-time and run-time bounds-checking, and some warnings])
+  AH_VERBATIM([FORTIFY_SOURCE],
+  [/* Enable compile-time and run-time bounds-checking, and some warnings,
+      without upsetting glibc 2.15+. */
+   #if 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/.