added hardened-gcc exclude flags in the Makefiles

4 files changed, 28 insertions, 7 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index 4d34a4ab8e5f..4ab58b37c3dc 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,6 +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.32 2003/09/01 19:24:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.33 2003/09/06 16:20:00 pappy Exp $
+
+  06 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
 
 *lilo-22.5.7.2 (01 Sep 2003)
 
diff --git a/sys-apps/lilo/Manifest b/sys-apps/lilo/Manifest
index d0d3de1addbf..0704d913c748 100644
--- a/sys-apps/lilo/Manifest
+++ b/sys-apps/lilo/Manifest
@@ -1,11 +1,11 @@
-MD5 fa12928154ea4f2043f6daaec234f20f ChangeLog 5659
+MD5 5eb53ca4f2aa1bb2202abd1bdfcc0286 ChangeLog 5658
 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 af8bb3fad2a22ceb3ca9bcfcd77d841a lilo-22.5.1.ebuild 4721
+MD5 c103905af186c36423f85ea015b737dd lilo-22.5.1.ebuild 4721
 MD5 01bd0c419e2f78240949543992494dc8 lilo-22.5.6-r2.ebuild 3540
 MD5 f9f89e2d601b6c9f6acb95ce00759c78 lilo-22.5.6-r3.ebuild 3826
-MD5 6feeff266968bacd37976e974455faba lilo-22.5.7.2.ebuild 4222
+MD5 52cb9956c261377a6a4ba47113c39d73 lilo-22.5.7.2.ebuild 4221
 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 5bae9ba14d85..a66187b67ecd 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.9 2003/08/05 19:52:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.1.ebuild,v 1.10 2003/09/06 16:20:00 pappy Exp $
 
 inherit mount-boot eutils
 
@@ -36,6 +36,12 @@ src_unpack() {
 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
+		CC="${CC} -yet_exec"
+	fi
+
 	emake CC="${CC}" OPT="-O1" || die
 }
 
diff --git a/sys-apps/lilo/lilo-22.5.7.2.ebuild b/sys-apps/lilo/lilo-22.5.7.2.ebuild
index e066075c94ee..2d1e76653d50 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.1 2003/09/01 19:24:55 azarah Exp $
+# $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 $
 
 inherit mount-boot eutils
 
@@ -41,7 +41,18 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="${CC:=gcc}" lilo || die
+
+	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"
+		find ${W} -type f -name "Makefile" -exec sed -i "s:CC=cc:CC=${CC} ${CFLAGS} -yet_exec:" {} \;
+		sleep 2s
+	fi
+
+	emake lilo || die
 }
 
 src_install() {