diff options
| author |   Alexander Gabert <pappy@gentoo.org> | 2004-05-12 13:03:24 +0000 |
|---|---|---|
| committer | Alexander Gabert <pappy@gentoo.org> | 2004-05-12 13:03:24 +0000 |
| commit | 96b52b7de3f8d8c79a6cb5702d83eef826cc629a (patch) | |
| tree | e46da49d8536e5eda1b2e1b5996d089ef2030702 /sys-boot/grub | |
| parent | removed hardened-gcc logic (Manifest recommit) (diff) | |
| download | gentoo-2-96b52b7de3f8d8c79a6cb5702d83eef826cc629a.tar.gz gentoo-2-96b52b7de3f8d8c79a6cb5702d83eef826cc629a.tar.bz2 gentoo-2-96b52b7de3f8d8c79a6cb5702d83eef826cc629a.zip | |
removed hardened-gcc logic, added logic for suppressing PIE and SSP
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.93.20030118.ebuild | 17 |
3 files changed, 18 insertions, 16 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 3119bfe254d3..f67df145e4ee 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-boot/grub # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.14 2004/05/06 22:35:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.15 2004/05/12 13:03:24 pappy Exp $ + + 12 May 2004; Alexander Gabert <pappy@gentoo.org> grub-0.93.20030118.ebuild: + removed hardened-gcc logic, added logic for suppressing PIE and SSP 06 May 2004; Mike Frysinger <vapier@gentoo.org> +files/grub-0.94-gcc3.4.patch, grub-0.94-r1.ebuild: diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 9e6d294208f3..fad3dd2b0a41 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,11 +1,11 @@ +MD5 e050042ba495754f1a920b4c4bf038ec ChangeLog 9017 +MD5 8098e19e3f056d996f517a8cbc254536 grub-0.92-r1.ebuild 2546 +MD5 d0d5b277e501f22919a2333d7c677584 grub-0.93.20030118.ebuild 2523 +MD5 63571b0129e60600df6580d43c717058 grub-0.94-r1.ebuild 3317 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133 MD5 b302edf756d9f8996d9e1ae6d3a49768 files/digest-grub-0.93.20030118 1764 +MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131 MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639 MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856 -MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131 MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479 -MD5 d7063dcccc8a3823fcbe44fc1ea2db32 ChangeLog 8868 -MD5 8098e19e3f056d996f517a8cbc254536 grub-0.92-r1.ebuild 2546 -MD5 143492d67264ac30e251ffb1d62a1a67 grub-0.93.20030118.ebuild 2429 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 63571b0129e60600df6580d43c717058 grub-0.94-r1.ebuild 3317 diff --git a/sys-boot/grub/grub-0.93.20030118.ebuild b/sys-boot/grub/grub-0.93.20030118.ebuild index 74d99bea35a9..c947b0d446ad 100644 --- a/sys-boot/grub/grub-0.93.20030118.ebuild +++ b/sys-boot/grub/grub-0.93.20030118.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.93.20030118.ebuild,v 1.5 2004/01/30 07:22:15 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.93.20030118.ebuild,v 1.6 2004/05/12 13:03:24 pappy Exp $ inherit mount-boot eutils flag-o-matic @@ -44,6 +44,7 @@ src_unpack() { src_compile() { filter-flags -fstack-protector + filter-flags -fPIC ### i686-specific code in the boot loader is a bad idea; disabling to ensure ### at least some compatibility if the hard drive is moved to an older or @@ -52,16 +53,14 @@ src_compile() { use static && export LDFLAGS="${LDFLAGS} -static" - # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ] - then - # the configure script has problems with -nostdlib - CC="${CC} -yet_exec -yno_propolice" - fi + # hardened automatic PIC plus PIE building should be suppressed + # because of assembler instructions that cannot be compiled PIC + HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -nopie` `test_flag -fno-stack-protector`" - econf --exec-prefix=/ \ + econf CC="${CC:=gcc} ${HARDENED_CFLAGS}" --exec-prefix=/ \ --disable-auto-linux-mem-opt || die - emake || die + + emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" || die } src_install() { |