diff options
author | Ned Ludd <solar@gentoo.org> | 2004-05-04 17:26:25 +0000 |
---|---|---|
committer | Ned Ludd <solar@gentoo.org> | 2004-05-04 17:26:25 +0000 |
commit | 2054eefa063fa22cd5cfbc5c2b84508214248c2d (patch) | |
tree | 42d448a187f8c3f0b7af8efdfc0362b3c7148b5c /sys-devel | |
parent | Stable on alpha. (Manifest recommit) (diff) | |
download | gentoo-2-2054eefa063fa22cd5cfbc5c2b84508214248c2d.tar.gz gentoo-2-2054eefa063fa22cd5cfbc5c2b84508214248c2d.tar.bz2 gentoo-2-2054eefa063fa22cd5cfbc5c2b84508214248c2d.zip |
fixed typo's and limit USE hardened piessp by default to x86 only for now
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-r4.ebuild | 18 |
3 files changed, 13 insertions, 14 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index c737657813ec..82687cb7bd3b 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.234 2004/05/04 03:00:35 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.235 2004/05/04 17:26:25 solar Exp $ + + 04 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild: + fixed typo's and limit USE hardened piessp by default to x86 only for now 03 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild, files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch: diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index ec1d1ab32e49..185fb950cac6 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,6 +1,6 @@ MD5 f688b2de404af86d1f1af7d77108d854 gcc-3.3.3-r3.ebuild 24320 -MD5 7fc4b586ba9026462f879177ff985b6c ChangeLog 47740 -MD5 d0a4d648fc4fdf2b19c8cb81a1da2a66 gcc-3.3.3-r4.ebuild 25351 +MD5 20ead35073a702e337fa27d1676e1053 ChangeLog 47872 +MD5 9c5943df10cc1589c2903f794f268699 gcc-3.3.3-r4.ebuild 25233 MD5 4bc0ae0e0e19f54dc1ea7a075745b063 gcc-2.95.3-r7.ebuild 5396 MD5 c7e55fc7f4bfd637f45786c0c5fbb365 gcc-2.95.3-r8.ebuild 9095 MD5 b6a375116a668edbe10b2ac2e1f9fc6d gcc-3.0.4-r6.ebuild 8577 diff --git a/sys-devel/gcc/gcc-3.3.3-r4.ebuild b/sys-devel/gcc/gcc-3.3.3-r4.ebuild index c59112314414..1dfbef9abd75 100644 --- a/sys-devel/gcc/gcc-3.3.3-r4.ebuild +++ b/sys-devel/gcc/gcc-3.3.3-r4.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-r4.ebuild,v 1.5 2004/05/04 14:58:18 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r4.ebuild,v 1.6 2004/05/04 17:26:25 solar Exp $ IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc debug" @@ -370,11 +370,11 @@ src_unpack() { use uclibc || epatch ${DISTDIR}/${SSP_EXCLUSION_PATCH} release_version="${release_version}, pie-${PIE_VER}" - - if [ -n "`use hardened`" -a "${ARCH}" != "sparc" -a "${ARCH}" != "ppc64" -a "${ARCH}" != "s390" ] + if ( use x86 && use hardened ) then + # [ "${ARCH}" != "sparc" && "${ARCH}" != "ppc64" && "${ARCH}" != "s390" ] einfo "Updating gcc to use automatic PIE + SSP building ..." - sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP|' \ + sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP |' \ -i ${S}/gcc/Makefile.in || die "Failed to update gcc!" # rebrand to make bug reports easier @@ -402,7 +402,6 @@ src_unpack() { # gcc 3.4.1 cvs has patches that need back porting.. # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004) sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in - sed -i -e 's|^#define HAVE_LD_AS_NEEDED 1.*$|/* #undef HAVE_LD_AS_NEEDED */|' -i gcc/auto-host.h cd ${S}; ./contrib/gcc_update --touch &> /dev/null } @@ -611,7 +610,7 @@ src_install() { # Make sure we dont have stuff lying around that # can nuke multiple versions of gcc - if [ -z "`use build`" ] + if ! use build then cd ${D}${LIBPATH} @@ -682,13 +681,10 @@ src_install() { fi # This one comes with binutils - if [ -f "${D}${LOC}/lib/libiberty.a" ] - then - rm -f ${D}${LOC}/lib/libiberty.a - fi + [ -f "${D}${LOC}/lib/libiberty.a" ] && rm -f ${D}${LOC}/lib/libiberty.a cd ${S} - if [ -z "`use build`" ] + if ! use build then cd ${S} docinto /${CCHOST} |