diff options
| author |   Alexander Gabert <pappy@gentoo.org> | 2003-10-09 19:10:26 +0000 |
|---|---|---|
| committer | Alexander Gabert <pappy@gentoo.org> | 2003-10-09 19:10:26 +0000 |
| commit | 5afd5b2596d26b1fdecfe2332b7c02585eee7fb6 (patch) | |
| tree | 5bc3383952b1fc6679146d9b22da4c32d2d51c41 /sys-apps/modutils | |
| parent | changed hardened-gcc behaviour in respect to hppa (diff) | |
| download | gentoo-2-5afd5b2596d26b1fdecfe2332b7c02585eee7fb6.tar.gz gentoo-2-5afd5b2596d26b1fdecfe2332b7c02585eee7fb6.tar.bz2 gentoo-2-5afd5b2596d26b1fdecfe2332b7c02585eee7fb6.zip | |
changed hardened-gcc behaviour in respect to hppa
Diffstat (limited to 'sys-apps/modutils')
| -rw-r--r-- | sys-apps/modutils/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/modutils/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/modutils/modutils-2.4.25.ebuild | 17 |
3 files changed, 19 insertions, 7 deletions
diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog index 1e81e5d72bcb..9582b63484eb 100644 --- a/sys-apps/modutils/ChangeLog +++ b/sys-apps/modutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/modutils # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.31 2003/10/08 06:15:27 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.32 2003/10/09 19:10:16 pappy Exp $ + + 09 Oct 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild: + changed hardened-gcc behaviour in respect to hppa 08 Oct 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild: hppa does not needs fstackprot with hcc diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest index cc808fc81f7d..c550599573dd 100644 --- a/sys-apps/modutils/Manifest +++ b/sys-apps/modutils/Manifest @@ -4,8 +4,8 @@ MD5 8aecad8c011d53493c84ddf5427e0a33 modutils-2.4.24.ebuild 1334 MD5 df7d440cbfdd4dbb63486b8a2e8d6355 modutils-2.4.23.ebuild 1394 MD5 a73b8ecd4dcc019f9bce873ee9bc40a6 modutils-2.4.19.ebuild 1130 MD5 47b2463bfba5154bfb2961d32be5e205 modutils-2.4.16-r3.ebuild 1212 -MD5 786ccc7a8c5997aa54e2dd3839f55498 ChangeLog 5162 -MD5 0a8b25baeaea08c8b8cbdb6e774364d4 modutils-2.4.25.ebuild 1853 +MD5 6de196279226b367d98840273dd9fda6 ChangeLog 5162 +MD5 c53fe8fc6b040d492853856e8fb8ea67 modutils-2.4.25.ebuild 1853 MD5 759c27455fab35ff3d1e14a0aa412c5b modutils-2.4.20.ebuild 1044 MD5 2a538675787b2c0d36e17a54b7205ada files/digest-modutils-2.4.16-r2 68 MD5 2a538675787b2c0d36e17a54b7205ada files/digest-modutils-2.4.16-r3 68 diff --git a/sys-apps/modutils/modutils-2.4.25.ebuild b/sys-apps/modutils/modutils-2.4.25.ebuild index 47c8a4fa0185..5605c99ca83b 100644 --- a/sys-apps/modutils/modutils-2.4.25.ebuild +++ b/sys-apps/modutils/modutils-2.4.25.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/modutils/modutils-2.4.25.ebuild,v 1.16 2003/10/08 06:15:27 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.17 2003/10/09 19:10:16 pappy Exp $ inherit flag-o-matic @@ -24,10 +24,19 @@ src_compile() { # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml # we disable etdyn because of assembler and extra add fstackprotector plus the necessary libs - if has_version 'sys-devel/hardened-gcc' + if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version 'sys-devel/hardened-gcc' then - [ "${ARCH}" != "hppa" ] && append-flags "-yet_exec -fstack-protector -Wl,$(gcc-config -L)/libgcc.a -Wl,/lib/libc.so.6" - [ "${ARCH}" == "hppa" ] && append-flags "-yet_exec" + append-flags "-yet_exec -fstack-protector" + fi + + if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc' + then + append-flags "-yet_exec" + fi + + if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc' + then + append-flags "-yet_exec" fi myconf="" |