diff options
| author |   Alexander Gabert <pappy@gentoo.org> | 2004-02-26 21:07:14 +0000 |
|---|---|---|
| committer | Alexander Gabert <pappy@gentoo.org> | 2004-02-26 21:07:14 +0000 |
| commit | b4a80dff194ef5eaca112ce246e096c361e2ee46 (patch) | |
| tree | 83db7b3a3999e76a6b59e37305c9c8cf8e993770 /sys-devel | |
| parent | stable on alpha and ia64 for bug 42232 (Manifest recommit) (diff) | |
| download | gentoo-2-b4a80dff194ef5eaca112ce246e096c361e2ee46.tar.gz gentoo-2-b4a80dff194ef5eaca112ce246e096c361e2ee46.tar.bz2 gentoo-2-b4a80dff194ef5eaca112ce246e096c361e2ee46.zip | |
changed typo in FVER of SSP, fixed up release_version logic a bit
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/gcc/Manifest | 4 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.3-r1.ebuild | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 8b5133e2fafd..d5aafecefdc7 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.183 2004/02/26 20:36:49 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.184 2004/02/26 21:07:14 pappy Exp $ + + 26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-3.3.3-r1.ebuild: + changed typo in FVER of SSP, fixed up release_version logic a bit 26 Feb 2004; Alexander Gabert <pappy@gentoo.org> gcc-2.95.3-r7.ebuild, gcc-2.95.3-r8.ebuild, gcc-3.0.4-r6.ebuild, gcc-3.1-r8.ebuild, diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 9c0b69c0cc95..9abbe8e02d3b 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -15,7 +15,7 @@ MD5 660074fa86b8cf9f8f2b1e019b367d10 gcc-3.3.3.ebuild 21995 MD5 bd281971d3658dd49f02f647b97c4eeb gcc-3.3.1-r5.ebuild 18002 MD5 47ffa6643befdc2cdee9429250e04083 gcc-3.2.3-r3.ebuild 19837 MD5 a18ba0e1ee7104324747ea7e48bc3bde gcc-3.0.4-r6.ebuild 8734 -MD5 a949ad9ba3244c1ddae4cc6e034c37f8 gcc-3.3.3-r1.ebuild 22972 +MD5 0874e4f6fa8af46be4a25f7dfa44234b gcc-3.3.3-r1.ebuild 22951 MD5 9b8734298131d849185f1e9cbe4b42eb gcc-3.1.1-r1.ebuild 9591 MD5 14cf69f1206d85356781dd2ad63eb7ca gcc-3.3.2-r4.ebuild 20741 MD5 9a1b8330dd0094a8e27e53edf7f67d58 gcc-3.2.2.ebuild 16081 @@ -24,7 +24,7 @@ MD5 591e5cb9a9737b7712643eccae1745f0 gcc-3.2-r5.ebuild 12882 MD5 878b7184447786f3a855d7e6f3f1cad5 gcc-3.3.2-r6.ebuild 21281 MD5 ba88d0ddfc983b09757fb3d4c8175063 gcc-3.1-r8.ebuild 9772 MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965 -MD5 c2d64dddfd1da60b5c292020e067c96c ChangeLog 39213 +MD5 14ce507574a7fd158b67a514f91dc0f1 ChangeLog 39354 MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908 MD5 22d9e3c49111d1b8b8ec1484732087c9 metadata.xml 259 MD5 8d59e9c42fb370299805308137fd21e5 gcc-3.2.3-r2.ebuild 17301 diff --git a/sys-devel/gcc/gcc-3.3.3-r1.ebuild b/sys-devel/gcc/gcc-3.3.3-r1.ebuild index 21c76f09ce89..d34f6c48bc4a 100644 --- a/sys-devel/gcc/gcc-3.3.3-r1.ebuild +++ b/sys-devel/gcc/gcc-3.3.3-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-devel/gcc/gcc-3.3.3-r1.ebuild,v 1.4 2004/02/26 20:36:49 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r1.ebuild,v 1.5 2004/02/26 21:07:14 pappy Exp $ IUSE="static nls bootstrap java build X multilib nogcj" @@ -334,7 +334,7 @@ src_unpack() { cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found" cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found" - release_version="${release_version}, ssp-${PP_VER}" + release_version="${release_version}, ssp-${PP_FVER}" update_gcc_for_libc_ssp fi @@ -344,6 +344,8 @@ src_unpack() { cd ${WORKDIR}/${P}; epatch "${DISTDIR}/gcc-3.3.2-nodefault-pie-ssp.patch" + release_version="${release_version}, pie-${PIE_VER}" + if [ -n "`use hardened`" ] then einfo "Updating gcc to use automatic PIE + SSP building ..." @@ -351,9 +353,7 @@ src_unpack() { -i ${S}/gcc/Makefile.in || die "Failed to update gcc!" # will show if default PIE/SSP building was used - make bug reports easier - release_version="${release_version/Gentoo/Gentoo Hardened}, pie-${PIE_VER}" - else - release_version="${release_version}, pie-${PIE_VER}" + release_version="${release_version/Gentoo/Gentoo Hardened}" fi version_patch ${FILESDIR}/3.3.3/gcc333-gentoo-branding.patch \ |