summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gabert <pappy@gentoo.org>2003-09-25 16:29:26 +0000
committerAlexander Gabert <pappy@gentoo.org>2003-09-25 16:29:26 +0000
commit8210cb55bb445e0c3f80199bcb7688120106ddc5 (patch)
tree3ba36457937114815f19c106e77f06ca470c856b /sys-apps/modutils
parentbugfixes for hardened-gcc (diff)
downloadgentoo-2-8210cb55bb445e0c3f80199bcb7688120106ddc5.tar.gz
gentoo-2-8210cb55bb445e0c3f80199bcb7688120106ddc5.tar.bz2
gentoo-2-8210cb55bb445e0c3f80199bcb7688120106ddc5.zip
bugfixes for hardened-gcc
Diffstat (limited to 'sys-apps/modutils')
-rw-r--r--sys-apps/modutils/ChangeLog5
-rw-r--r--sys-apps/modutils/Manifest4
-rw-r--r--sys-apps/modutils/modutils-2.4.25.ebuild10
3 files changed, 13 insertions, 6 deletions
diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog
index f88e501f907a..ae5870d4e69c 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.29 2003/09/06 14:47:53 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.30 2003/09/25 16:29:18 pappy Exp $
+
+ 25 Sep 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
+ bugfixes for hardened-gcc
06 Sep 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
added hardened-gcc exclude flags
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index 0b5446d539e9..c2db71da88c6 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 3e649a421817647a865731659dd074b0 ChangeLog 4916
-MD5 b1881782172a65905c4f96645c95ca8a modutils-2.4.25.ebuild 1631
+MD5 be31f6a0658ac7b7e18ceb37065632ea ChangeLog 4916
+MD5 24f611cdea223701f7861e65e18fb4a7 modutils-2.4.25.ebuild 1628
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 d2ed6309f845..915dbc3d310f 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.12 2003/09/07 00:43:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.13 2003/09/25 16:29:18 pappy Exp $
inherit flag-o-matic
@@ -23,8 +23,12 @@ src_compile() {
filter-flags -fPIC
# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
- has_version 'sys-devel/hardened-gcc' && append-flags '-yet_exec'
-
+ # we disable etdyn because of assembler and extra add fstackprotector plus the necessary libs
+ if has_version 'sys-devel/hardened-gcc'
+ then
+ append-flags "-yet_exec -fstack-protector -Wl,$(gcc-config -L)/libgcc.a -Wl,/lib/libc.so.6"
+ fi
+
myconf=""
# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
#