diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-05-03 09:14:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-05-03 09:14:26 +0000 |
| commit | c0c42dcc2260be6fccffd9e9014e0bae71ab6205 (patch) | |
| tree | 973dfcb70b4422aeea1c8cb52cd503df74ead74f | |
| parent | added 1.9.8 #49609, hardmasked. (Manifest recommit) (diff) | |
| download | gentoo-2-c0c42dcc2260be6fccffd9e9014e0bae71ab6205.tar.gz gentoo-2-c0c42dcc2260be6fccffd9e9014e0bae71ab6205.tar.bz2 gentoo-2-c0c42dcc2260be6fccffd9e9014e0bae71ab6205.zip | |
port -r4 arm patch to -r3
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.3-r3.ebuild | 11 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.3-r4.ebuild | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 7dce745f90f0..e29efe090552 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,10 +1,10 @@ # 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.232 2004/05/02 18:44:55 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.233 2004/05/03 09:14:26 vapier Exp $ *gcc-3.3.3-r4 (02 May 2004) - 02 May 2004; <solar@gentoo.org> gcc-3.3.3-r4.ebuild: + 02 May 2004; <solar@gentoo.org> gcc-3.3.3-r3, gcc-3.3.3-r4.ebuild: ARM is having issues with static linking as the spec file calls for crtbeginT.o vs crtbeginS.o so we disable improved handling patch till we can take a closer look. FIXME diff --git a/sys-devel/gcc/gcc-3.3.3-r3.ebuild b/sys-devel/gcc/gcc-3.3.3-r3.ebuild index 51a3476b3eb5..b017abac874e 100644 --- a/sys-devel/gcc/gcc-3.3.3-r3.ebuild +++ b/sys-devel/gcc/gcc-3.3.3-r3.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-r3.ebuild,v 1.5 2004/04/30 00:31:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.6 2004/05/03 09:14:26 vapier Exp $ IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc" @@ -355,12 +355,15 @@ src_unpack() { # enable it by default ... cd ${WORKDIR}/${P} - epatch ${DISTDIR}/${PIE_SSP_PATCH} - use uclibc || epatch ${DISTDIR}/${PIE_EXCLUSION_PATCH} + if [ "${ARCH}" != "arm" ] + then + epatch ${DISTDIR}/${PIE_SSP_PATCH} + use uclibc || epatch ${DISTDIR}/${PIE_EXCLUSION_PATCH} + fi release_version="${release_version}, pie-${PIE_VER}" - if [ -n "`use hardened`" -a "${ARCH}" != "sparc" ] + if [ -n "`use hardened`" -a "${ARCH}" != "sparc" -a "${ARCH}" != "arm" ] then einfo "Updating gcc to use automatic PIE + SSP building ..." sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP|' \ diff --git a/sys-devel/gcc/gcc-3.3.3-r4.ebuild b/sys-devel/gcc/gcc-3.3.3-r4.ebuild index 06ff233acb3b..afa01579e319 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.2 2004/05/02 18:44:55 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r4.ebuild,v 1.3 2004/05/03 09:14:26 vapier Exp $ IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc debug" @@ -110,7 +110,7 @@ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" -#KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~alpha ~ia64 ~ppc64 ~s390" +#KEYWORDS="~x86 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390" KEYWORDS="-*" # Ok, this is a hairy one again, but lets assume that we |