Subject: bug#12714: [PATCH] build: do not redefine _FORTIFY_SOURCE

From: Jim Meyering <[email-masked]>
Date: Wed, 24 Oct 2012 18:09:27 +0200

Mike Frysinger wrote:

> On Tuesday 23 October 2012 15:26:14 Jim Meyering wrote:
>> Mike Frysinger wrote:
>> > If the active compiler or flags have already defined _FORTIFY_SOURCE,
>> > don't go overriding that.  Otherwise we get a lot of spew about the
>> > flag being redefined.
>> >
>> > * configure.ac (FORTIFY_SOURCE): Check if _FORTIFY_SOURCE is defined.
>> > ---
...
>> Thanks.  Please adjust the log (or just tell us and we'll adjust it)
>> so that we know which compiler motivates this change.
>
> Ubuntu will enable _FORTIFY_SOURCE by default.  not sure about Debian.  Gentoo
> has been doing it for a while.

Thanks.  I've adjusted the log.
Ok with you?

>From 9517680ed3d4d7baff8a842a052ad405f9e9049f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <[email-masked]>
Date: Tue, 23 Oct 2012 15:20:07 -0400
Subject: [PATCH] build: do not redefine _FORTIFY_SOURCE

When _FORTIFY_SOURCE is defined by the compiler or via flags, as
it is on Gentoo, do not override it.  Otherwise we get many
redefinition warnings.

* configure.ac (FORTIFY_SOURCE): Check if _FORTIFY_SOURCE is defined.
This addresses http://bugs.gnu.org/12714
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e5e05be..6504144 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,7 +170,7 @@ if test "$gl_gcc_warnings" = yes; then
   AH_VERBATIM([FORTIFY_SOURCE],
   [/* Enable compile-time and run-time bounds-checking, and some warnings,
       without upsetting glibc 2.15+. */
-   #if defined __OPTIMIZE__ && __OPTIMIZE__
+   #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
    # define _FORTIFY_SOURCE 2
    #endif
   ])
--
1.8.0