From 31fa3b5d3543246568f562a3a399fb6aed02ff8a Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Aug 05 2013 15:49:40 +0000
Subject: Fix compiler flags to deal with -fstack-protector-strong


---

diff --git a/grub2.spec b/grub2.spec
index fc084bf..2f82f9b 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -647,6 +647,7 @@ cd grub-efi-%{tarversion}
 	CFLAGS="$(echo $RPM_OPT_FLAGS | sed			\
 		-e 's/-O.//g'					\
 		-e 's/-fstack-protector\(-[[:alnum:]]\+\)*//g'	\
+		-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]//g'	\
 		-e 's/--param=ssp-buffer-size=4//g'		\
 		-e 's/-mregparm=3/-mregparm=4/g'		\
 		-e 's/-fexceptions//g'				\
@@ -685,7 +686,8 @@ cd grub-%{tarversion}
 %configure							\
 	CFLAGS="$(echo $RPM_OPT_FLAGS | sed			\
 		-e 's/-O.//g'					\
-		-e 's/-fstack-protector//g'			\
+		-e 's/-fstack-protector\(-[[:alnum:]]\+\)*//g'	\
+		-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]//g'	\
 		-e 's/--param=ssp-buffer-size=4//g'		\
 		-e 's/-mregparm=3/-mregparm=4/g'		\
 		-e 's/-fexceptions//g'				\