changed hardened PIC PIE flag logic for all lilo ebuilds

8 files changed, 54 insertions, 72 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index bf37a291d219..eab878c7fae9 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.9 2004/05/11 07:34:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.10 2004/05/12 12:11:54 pappy Exp $
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> lilo-22.5.1.ebuild,
+  lilo-22.5.7.2.ebuild, lilo-22.5.8-r1.ebuild, lilo-22.5.8-r2.ebuild,
+  lilo-22.5.8-r3.ebuild, lilo-22.5.8.ebuild:
+  changed hardened PIC PIE flag logic for all lilo ebuilds
 
   11 May 2004; Michael Sterrett <mr_bones_@gentoo.org> lilo-22.5.8-r3.ebuild:
   fix dep
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index f22310baa216..50643286a041 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,21 +1,21 @@
-MD5 176d650e2e2b42c6a698e03be478da8a ChangeLog 7862
-MD5 6f9d0477c845e1a0541d4550126e16df lilo-22.5.8-r2.ebuild 4638
-MD5 e046139dc003843c123ade79dd331bb3 lilo-22.5.8-r3.ebuild 4804
-MD5 e5c7a36acafab7b3728c01457140e82a lilo-22.5.1.ebuild 4286
+MD5 9e4e9cd69286b311b9a1ba6b2bfe5a7a ChangeLog 8108
+MD5 4617242cb8f05c53f8e259697bde1b64 lilo-22.5.1.ebuild 4396
 MD5 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190
-MD5 0f4187f805b8c78c9a7b3da37c19ba6d lilo-22.5.7.2.ebuild 3924
-MD5 2d537b64b8df51695e62850926248258 lilo-22.5.8-r1.ebuild 4507
-MD5 f1ac83767a893165a9b24b808dda2cc4 lilo-22.5.8.ebuild 3991
+MD5 335e01f34ab1890c06bd256cf40000c3 lilo-22.5.7.2.ebuild 3984
+MD5 1b3259fa8639c940be4450f92ffffcf0 lilo-22.5.8-r1.ebuild 4346
+MD5 ea1c9f427f1546dff7af204ef95ae7d2 lilo-22.5.8-r2.ebuild 4462
+MD5 fbd9d6554cd3a03828cf8c4697232141 lilo-22.5.8.ebuild 4038
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 ca44cc6ec0aecfe30c49c455f74aacec files/lilo-glibc233.patch 640
-MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.8.lvm.2-6headers.patch 470
+MD5 804e8637e8c4ff3ee66446881a374f9c lilo-22.5.8-r3.ebuild 4643
 MD5 8e75fea24b47485fd4185b9962745117 files/digest-lilo-22.5.1 63
 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63
-MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
 MD5 89d3f49772308bc3fb195f51c9ff1035 files/digest-lilo-22.5.7.2 65
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63
+MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.8-create-install-dirs.patch 970
-MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719
 MD5 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.8-devmapper_gentoo.patch 11889
+MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.8.lvm.2-6headers.patch 470
+MD5 ca44cc6ec0aecfe30c49c455f74aacec files/lilo-glibc233.patch 640
+MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r3 63
diff --git a/sys-boot/lilo/lilo-22.5.1.ebuild b/sys-boot/lilo/lilo-22.5.1.ebuild
index 7f7506c303ee..be6771b7112f 100644
--- a/sys-boot/lilo/lilo-22.5.1.ebuild
+++ b/sys-boot/lilo/lilo-22.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.1.ebuild,v 1.3 2004/01/19 18:35:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.1.ebuild,v 1.4 2004/05/12 12:11:54 pappy Exp $
 
-inherit mount-boot eutils
+inherit mount-boot eutils flag-o-matic
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Standard Linux boot loader"
@@ -28,15 +28,13 @@ src_unpack() {
 }
 
 src_compile() {
-	[ -z "${CC}" ] && CC="gcc"
 
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
-	then
-		CC="${CC} -yet_exec"
-	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`"
 
-	emake CC="${CC}" OPT="-O1" || die
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" OPT="-O1" || die
 }
 
 src_install() {
diff --git a/sys-boot/lilo/lilo-22.5.7.2.ebuild b/sys-boot/lilo/lilo-22.5.7.2.ebuild
index f05de2ce50ca..cb2e9c1e59d1 100644
--- a/sys-boot/lilo/lilo-22.5.7.2.ebuild
+++ b/sys-boot/lilo/lilo-22.5.7.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.7.2.ebuild,v 1.3 2004/01/19 18:35:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.7.2.ebuild,v 1.4 2004/05/12 12:11:54 pappy Exp $
 
-inherit mount-boot eutils
+inherit mount-boot eutils flag-o-matic
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard Linux boot loader"
@@ -41,15 +41,12 @@ src_unpack() {
 
 src_compile() {
 
-	CC="${CC:=gcc}"
+	# 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`"
 
-	# 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:" {} \;
-	fi
-
-	emake lilo || die
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo || die
 }
 
 src_install() {
diff --git a/sys-boot/lilo/lilo-22.5.8-r1.ebuild b/sys-boot/lilo/lilo-22.5.8-r1.ebuild
index 1b097ffca9de..7915c521242a 100644
--- a/sys-boot/lilo/lilo-22.5.8-r1.ebuild
+++ b/sys-boot/lilo/lilo-22.5.8-r1.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/lilo/lilo-22.5.8-r1.ebuild,v 1.7 2004/04/21 02:15:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r1.ebuild,v 1.8 2004/05/12 12:11:54 pappy Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -50,18 +50,13 @@ src_unpack() {
 }
 
 src_compile() {
-	# add the hardened-gcc compiler flag for building its assembler parts ;-)
-	if has_version 'sys-devel/hardened-gcc'
-	then
-		export CC="${CC:=gcc} -yet_exec"
-		find ${W} -type f -name "Makefile" -exec sed -i "s:CC=cc:CC=${CC}:" {} \;
-	fi
 
-	# Fixes borkage with hardened gccs and people who have -fPIC, etc in their specs.
-	has_pic && CC="${CC} `test_flag -nopie` `test_flag -yet_exec`"
+	# 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`"
 
-	# Do not use custom CFLAGS for stability reasons
-	emake CC="${CC:=gcc}" lilo || die
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo || die
 }
 
 src_install() {
diff --git a/sys-boot/lilo/lilo-22.5.8-r2.ebuild b/sys-boot/lilo/lilo-22.5.8-r2.ebuild
index e14408add1e9..85c839348aa6 100644
--- a/sys-boot/lilo/lilo-22.5.8-r2.ebuild
+++ b/sys-boot/lilo/lilo-22.5.8-r2.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/lilo/lilo-22.5.8-r2.ebuild,v 1.3 2004/04/21 02:15:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r2.ebuild,v 1.4 2004/05/12 12:11:54 pappy Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -53,18 +53,13 @@ src_unpack() {
 }
 
 src_compile() {
-	# add the hardened-gcc compiler flag for building its assembler parts ;-)
-	if has_version 'sys-devel/hardened-gcc'
-	then
-		export CC="${CC:=gcc} -yet_exec"
-		find ${W} -type f -name "Makefile" -exec sed -i "s:CC=cc:CC=${CC}:" {} \;
-	fi
 
-	# Fixes borkage with hardened gccs and people who have -fPIC, etc in their specs.
-	has_pic && CC="${CC} `test_flag -nopie` `test_flag -yet_exec`"
+	# 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`"
 
 	# Do not use custom CFLAGS for stability reasons
-	emake CC="${CC:=gcc}" lilo || die
+	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo || die
 }
 
 src_install() {
diff --git a/sys-boot/lilo/lilo-22.5.8-r3.ebuild b/sys-boot/lilo/lilo-22.5.8-r3.ebuild
index f5be07393b29..f6c4674c8419 100644
--- a/sys-boot/lilo/lilo-22.5.8-r3.ebuild
+++ b/sys-boot/lilo/lilo-22.5.8-r3.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/lilo/lilo-22.5.8-r3.ebuild,v 1.2 2004/05/11 07:34:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r3.ebuild,v 1.3 2004/05/12 12:11:54 pappy Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -60,18 +60,13 @@ src_unpack() {
 }
 
 src_compile() {
-	# add the hardened-gcc compiler flag for building its assembler parts ;-)
-	if has_version 'sys-devel/hardened-gcc'
-	then
-		export CC="${CC:=gcc} -yet_exec"
-		find ${W} -type f -name "Makefile" -exec sed -i "s:CC=cc:CC=${CC}:" {} \;
-	fi
 
-	# Fixes borkage with hardened gccs and people who have -fPIC, etc in their specs.
-	has_pic && CC="${CC} `test_flag -nopie` `test_flag -yet_exec`"
+	# 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`"
 
-	# Do not use custom CFLAGS for stability reasons
-	emake CC="${CC:=gcc}" lilo || die
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo || die
 }
 
 src_install() {
diff --git a/sys-boot/lilo/lilo-22.5.8.ebuild b/sys-boot/lilo/lilo-22.5.8.ebuild
index 5af77bdba5bb..051c94cc8e0b 100644
--- a/sys-boot/lilo/lilo-22.5.8.ebuild
+++ b/sys-boot/lilo/lilo-22.5.8.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/lilo/lilo-22.5.8.ebuild,v 1.3 2004/01/19 18:35:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8.ebuild,v 1.4 2004/05/12 12:11:54 pappy Exp $
 
 inherit mount-boot eutils
 
@@ -42,15 +42,12 @@ src_unpack() {
 
 src_compile() {
 
-	CC="${CC:=gcc}"
+	# 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`"
 
-	# 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:" {} \;
-	fi
-
-	emake lilo || die
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo || die
 }
 
 src_install() {