added hardened-gcc excludes

4 files changed, 13 insertions, 15 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index 4ab58b37c3dc..60eb3b9b7aca 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for sys-apps/lilo
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.33 2003/09/06 16:20:00 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.34 2003/09/06 22:50:40 pappy Exp $
 
-  06 Sep 2003; Alexander Gabert <pappy@gentoo.org> lilo-22.5.1.ebuild,
+  07 Sep 2003; Alexander Gabert <pappy@gentoo.org> lilo-22.5.1.ebuild,
   lilo-22.5.7.2.ebuild:
-  added hardened-gcc exclude flags in the Makefiles
+  added hardened-gcc excludes
 
 *lilo-22.5.7.2 (01 Sep 2003)
 
diff --git a/sys-apps/lilo/Manifest b/sys-apps/lilo/Manifest
index ba71e8f562e7..0c8c74f0a9d5 100644
--- a/sys-apps/lilo/Manifest
+++ b/sys-apps/lilo/Manifest
@@ -1,11 +1,11 @@
-MD5 778194cc608df703f49878d39c8afb2a ChangeLog 5636
+MD5 4728550cb28e0201154fe39c9f10fccd ChangeLog 5636
 MD5 a0c025ab9651ddaf0f1dc593a48df94a lilo-22.1-r3.ebuild 1582
 MD5 9d48349e4847a7aa2a6824848c57e8f2 lilo-22.3.3-r1.ebuild 1998
 MD5 7dd6ff54cf104acb2bf33b4c22b85460 lilo-22.3.4.ebuild 2003
-MD5 1fb524e02262322bfcc1168d1685caac lilo-22.5.1.ebuild 4677
+MD5 8ec15bb8ec2b6817648ff8bb53a4d4e2 lilo-22.5.1.ebuild 4677
 MD5 01bd0c419e2f78240949543992494dc8 lilo-22.5.6-r2.ebuild 3540
 MD5 f9f89e2d601b6c9f6acb95ce00759c78 lilo-22.5.6-r3.ebuild 3826
-MD5 6bc772a4ec1d3f08ac574bab3e349e71 lilo-22.5.7.2.ebuild 4084
+MD5 8931b4eea8b52e3b73d177b465be3165 lilo-22.5.7.2.ebuild 4084
 MD5 00de3473e03e180faad32ed00335cc7b files/digest-lilo-22.1-r3 61
 MD5 0a868ea4abd215e2181c6c756173b618 files/digest-lilo-22.3.3-r1 133
 MD5 93ff7a7535e7c8ff1327db52a3118bef files/digest-lilo-22.3.4 133
diff --git a/sys-apps/lilo/lilo-22.5.1.ebuild b/sys-apps/lilo/lilo-22.5.1.ebuild
index a66187b67ecd..7c0aa6c522f3 100644
--- a/sys-apps/lilo/lilo-22.5.1.ebuild
+++ b/sys-apps/lilo/lilo-22.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.1.ebuild,v 1.10 2003/09/06 16:20:00 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.1.ebuild,v 1.11 2003/09/06 22:50:41 pappy Exp $
 
 inherit mount-boot eutils
 
@@ -37,8 +37,8 @@ src_compile() {
 	[ -z "${CC}" ] && CC="gcc"
 
 	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	# lilo and grub have broken CFLAGS behaviour
-	if has_version 'sys-devel/hardened-gcc' && [ ${CC} = "gcc" ]; then
+	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
+	then
 		CC="${CC} -yet_exec"
 	fi
 
diff --git a/sys-apps/lilo/lilo-22.5.7.2.ebuild b/sys-apps/lilo/lilo-22.5.7.2.ebuild
index 2d1e76653d50..03aaaa2d6beb 100644
--- a/sys-apps/lilo/lilo-22.5.7.2.ebuild
+++ b/sys-apps/lilo/lilo-22.5.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.7.2.ebuild,v 1.2 2003/09/06 16:20:00 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.7.2.ebuild,v 1.3 2003/09/06 22:50:41 pappy Exp $
 
 inherit mount-boot eutils
 
@@ -44,12 +44,10 @@ src_compile() {
 
 	CC="${CC:=gcc}"
 
-    # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-    # lilo and grub have broken CFLAGS behaviour
-	if has_version 'sys-devel/hardened-gcc' && [ ${CC}="gcc" ] ; then
-		einfo "activating hardened-gcc exclude flags: ${CC} ${CFLAGS} -yet_exec"
+	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
+	if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ]
+	then
 		find ${W} -type f -name "Makefile" -exec sed -i "s:CC=cc:CC=${CC} ${CFLAGS} -yet_exec:" {} \;
-		sleep 2s
 	fi
 
 	emake lilo || die