diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2004-04-21 02:13:49 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-04-21 02:13:49 +0000 |
commit | d43f2f6870d53f42746af9fb921717ff3e38701d (patch) | |
tree | ee3d82202c7d5baf8bb3be4d590c2fb50e56e08b /sys-boot | |
parent | remove old version (Manifest recommit) (diff) | |
download | gentoo-2-d43f2f6870d53f42746af9fb921717ff3e38701d.tar.gz gentoo-2-d43f2f6870d53f42746af9fb921717ff3e38701d.tar.bz2 gentoo-2-d43f2f6870d53f42746af9fb921717ff3e38701d.zip |
Fixed borkage relating to -fPIC usage in default specs. Fix by tseng, thanks.
Diffstat (limited to 'sys-boot')
-rw-r--r-- | sys-boot/lilo/ChangeLog | 6 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.5.8-r1.ebuild | 5 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.5.8-r2.ebuild | 5 |
3 files changed, 13 insertions, 3 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/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 } |