rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FORTIFY_SOURCE for util/

Browse Source 
Related: rhbz#1049047

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2014-03-13 13:48:55 -04:00
parent 8c7f7590b2
commit 864f3652f5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grub2.spec
View File

@ -56,7 +56,6 @@ URL: http://www.gnu.org/software/grub/
Obsoletes: grub < 1:0.98 Obsoletes: grub < 1:0.98
Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
#Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
Source3: README.Fedora
Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz
Source5: theme.tar.bz2 Source5: theme.tar.bz2
#Source6: grub-cd.cfg #Source6: grub-cd.cfg
@ -222,8 +221,7 @@ cd grub-efi-%{tarversion}
%configure \ %configure \
CFLAGS="$(echo $RPM_OPT_FLAGS | sed \ CFLAGS="$(echo $RPM_OPT_FLAGS | sed \
-e 's/-O.//g' \ -e 's/-O.//g' \
-e 's/-fstack-protector\(-[[:alnum:]]\+\)*//g' \ -e 's/-fstack-protector[[:alpha:]-]\+//g' \
-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]//g' \
-e 's/--param=ssp-buffer-size=4//g' \ -e 's/--param=ssp-buffer-size=4//g' \
-e 's/-mregparm=3/-mregparm=4/g' \ -e 's/-mregparm=3/-mregparm=4/g' \
-e 's/-fexceptions//g' \ -e 's/-fexceptions//g' \
@ -235,6 +233,7 @@ cd grub-efi-%{tarversion}
--program-transform-name=s,grub,%{name}, \ --program-transform-name=s,grub,%{name}, \
--disable-grub-mount \ --disable-grub-mount \
--disable-werror --disable-werror
make %{?_smp_mflags} make %{?_smp_mflags}
GRUB_MODULES=" all_video boot btrfs cat chain configfile echo efifwsetup \ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo efifwsetup \
efinet ext2 fat font gfxmenu gfxterm gzio halt hfsplus iso9660 \ efinet ext2 fat font gfxmenu gfxterm gzio halt hfsplus iso9660 \
@ -273,8 +272,7 @@ cd grub-%{tarversion}
%configure \ %configure \
CFLAGS="$(echo $RPM_OPT_FLAGS | sed \ CFLAGS="$(echo $RPM_OPT_FLAGS | sed \
-e 's/-O.//g' \ -e 's/-O.//g' \
-e 's/-fstack-protector\(-[[:alnum:]]\+\)*//g' \ -e 's/-fstack-protector[[:alpha:]-]\+//g' \
-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]//g' \
-e 's/--param=ssp-buffer-size=4//g' \ -e 's/--param=ssp-buffer-size=4//g' \
-e 's/-mregparm=3/-mregparm=4/g' \ -e 's/-mregparm=3/-mregparm=4/g' \
-e 's/-fexceptions//g' \ -e 's/-fexceptions//g' \