Fixed borkage relating to -fPIC usage in default specs. Fix by tseng, thanks.

4 files changed, 18 insertions, 8 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index c6c67cb605a7..404497c077d5 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2004/04/13 09:40:59 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.7 2004/04/21 02:13:49 eradicator Exp $
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  lilo-22.5.8-r1.ebuild, lilo-22.5.8-r2.ebuild:
+  Fixed borkage relating to -fPIC usage in default specs.  Fix by tseng, thanks.
 
 *lilo-22.5.8-r2 (13 Apr 2004)
 
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 1712f11bca15..67d2a3b43d7d 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,19 +1,19 @@
+MD5 542fca2bc63353bc8459607419ea26f4 lilo-22.5.8-r2.ebuild 4636
 MD5 0f4187f805b8c78c9a7b3da37c19ba6d lilo-22.5.7.2.ebuild 3924
+MD5 ab50fe6db8f40930ed1678ef40d48f14 lilo-22.5.8-r1.ebuild 4505
 MD5 e5c7a36acafab7b3728c01457140e82a lilo-22.5.1.ebuild 4286
 MD5 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190
 MD5 f1ac83767a893165a9b24b808dda2cc4 lilo-22.5.8.ebuild 3991
+MD5 2bd306b9cae8221dff9692c1ccc81b89 ChangeLog 7544
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 42297b80a20953368eb0ffdf107e6a52 lilo-22.5.8-r1.ebuild 4353
-MD5 0a5d324dd8aae495eb0f6505ffb056dd ChangeLog 7354
-MD5 b4b5f647f89c345fd8ef87d006a3e9f1 lilo-22.5.8-r2.ebuild 4485
+MD5 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.8-devmapper_gentoo.patch 11889
 MD5 8e75fea24b47485fd4185b9962745117 files/digest-lilo-22.5.1 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8 63
 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63
+MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
 MD5 89d3f49772308bc3fb195f51c9ff1035 files/digest-lilo-22.5.7.2 65
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.8-create-install-dirs.patch 970
 MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719
 MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.8.lvm.2-6headers.patch 470
 MD5 ca44cc6ec0aecfe30c49c455f74aacec files/lilo-glibc233.patch 640
-MD5 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.8-devmapper_gentoo.patch 11889
-MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
diff --git a/sys-boot/lilo/lilo-22.5.8-r1.ebuild b/sys-boot/lilo/lilo-22.5.8-r1.ebuild
index 83d2c8decc24..af39eb6f89f3 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.5 2004/02/08 13:48:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r1.ebuild,v 1.6 2004/04/21 02:13:49 eradicator Exp $
 
 inherit mount-boot eutils
 
@@ -56,6 +56,9 @@ src_compile() {
 		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`"
+
 	# Do not use custom CFLAGS for stability reasons
 	emake CC="${CC:=gcc}" lilo || die
 }
diff --git a/sys-boot/lilo/lilo-22.5.8-r2.ebuild b/sys-boot/lilo/lilo-22.5.8-r2.ebuild
index 9abcf1d9b00f..7191c2d667b6 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.1 2004/04/13 09:40:59 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r2.ebuild,v 1.2 2004/04/21 02:13:49 eradicator Exp $
 
 inherit mount-boot eutils
 
@@ -59,6 +59,9 @@ src_compile() {
 		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`"
+
 	# Do not use custom CFLAGS for stability reasons
 	emake CC="${CC:=gcc}" lilo || die
 }