diff options
author | Alexander Gabert <pappy@gentoo.org> | 2003-09-08 15:25:18 +0000 |
---|---|---|
committer | Alexander Gabert <pappy@gentoo.org> | 2003-09-08 15:25:18 +0000 |
commit | 7471476b3201a02a4358879bf5d78be28f71811e (patch) | |
tree | 2a47c4174f38f781489c92356d87fed714a2c870 /sys-libs/cracklib | |
parent | bug 28132 take out libgcc_s.so for gcc2.95 (diff) | |
download | gentoo-2-7471476b3201a02a4358879bf5d78be28f71811e.tar.gz gentoo-2-7471476b3201a02a4358879bf5d78be28f71811e.tar.bz2 gentoo-2-7471476b3201a02a4358879bf5d78be28f71811e.zip |
bug 28132 take out libgcc_s.so for gcc2.95
Diffstat (limited to 'sys-libs/cracklib')
-rw-r--r-- | sys-libs/cracklib/ChangeLog | 5 | ||||
-rw-r--r-- | sys-libs/cracklib/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/cracklib/cracklib-2.7-r7.ebuild | 15 |
3 files changed, 13 insertions, 11 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog index e71bba4de4a3..ffdf3c74cafa 100644 --- a/sys-libs/cracklib/ChangeLog +++ b/sys-libs/cracklib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/cracklib # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.28 2003/08/09 17:30:41 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.29 2003/09/08 15:24:50 pappy Exp $ + + 08 Sep 2003; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild: + bug 28132 take out libgcc_s.so for gcc2.95 09 Aug 2003; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild: adding propolice bugfix dependency only for gcc diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest index b39e7e79bda4..a48d27c23063 100644 --- a/sys-libs/cracklib/Manifest +++ b/sys-libs/cracklib/Manifest @@ -1,6 +1,6 @@ -MD5 d580e8393347eb5efcfee6762dfe5a14 ChangeLog 4167 +MD5 5f690118cd66bb165ad4718341cdf29d ChangeLog 4167 MD5 f2f55bc324a3b23ae5468f34b169be8f cracklib-2.7-r6.ebuild 1286 -MD5 870835304330eb630e3815482e5c7ed9 cracklib-2.7-r7.ebuild 1712 +MD5 6beb1493ea4ec1fbadaee72b1fce363b cracklib-2.7-r7.ebuild 1709 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333 MD5 9c566d6a249f8d02ad419aac76fffd66 files/cracklib-2.7-gentoo-new.diff 4244 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224 diff --git a/sys-libs/cracklib/cracklib-2.7-r7.ebuild b/sys-libs/cracklib/cracklib-2.7-r7.ebuild index f00c9e39a2e4..b81847ffa307 100644 --- a/sys-libs/cracklib/cracklib-2.7-r7.ebuild +++ b/sys-libs/cracklib/cracklib-2.7-r7.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r7.ebuild,v 1.16 2003/09/04 08:01:46 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r7.ebuild,v 1.17 2003/09/08 15:24:50 pappy Exp $ IUSE="" inherit flag-o-matic -# filter-flags "-fstack-protector" +filter-flags "-fstack-protector" MY_P=${P/-/,} S=${WORKDIR}/${MY_P} @@ -32,12 +32,11 @@ src_unpack() { [ "$ARCH" == "alpha" -a "${CC}" == "ccc" ] && \ epatch ${FILESDIR}/cracklib-${PV}-dec-alpha-compiler.diff - # do not need to filter-flags any more - # propolice -fstack-protector might need this one - if [ ${CC} == "gcc" ]; then - einfo "adding libgcc for propolice __guard symbol to cracklib" - sed -i "s:= ld:= ld $(gcc-config -L)/libgcc_s.so:" \ - ${S}/cracklib/Makefile + # this is only needed for the transparent hgcc + if has_version 'sys-devel/hardened-gcc' && [ ${CC} == "gcc" ] + then + einfo "hardened-gcc: adding libgcc for propolice __guard symbol to cracklib" + sed -i "s:= ld:= ld $(gcc-config -L)/libgcc_s.so:" ${S}/cracklib/Makefile fi } |