From: Robin H. Johnson <robin.johnson@dreamhost.com>
Date: Mon, 30 Nov 2015 21:20:45 +0000 (-0800)
Subject: Gentoo: _FORTIFY_SOURCE fix.
X-Git-Tag: v10.0.2~130^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ccf7c29bd0df500b47ac92e64768c72c96bdd038;p=ceph-ci.git

Gentoo: _FORTIFY_SOURCE fix.

GCC under Gentoo has a patch that has a built-in define for
_FORTIFY_SOURCE if -O2 or higher are used. This causes warnings about
_FORTIFY_SOURCE redefined for every single object compiled.

Work around the issue by explicitly undefining _FORTIFY_SOURCE before we
define it again.

http://tracker.ceph.com/issues/13920 Fixes: #13920
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 199d90a6892..3d8a252e378 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -57,6 +57,7 @@ HARDENING_CFLAGS = \
                    -g \
                    -pipe \
                    -Wall \
+                   -Wp,-U_FORTIFY_SOURCE \
                    -Wp,-D_FORTIFY_SOURCE=2 \
                    -fexceptions \
                    --param=ssp-buffer-size=4 \