diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-05-02 14:53:45 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-05-02 14:53:45 +0000 |
| commit | 662477e1ddbc9b60b0c6277d85fb3bae3e57ec2d (patch) | |
| tree | fea1a3483985f1fbbf5d747fb1983752f91c19e3 | |
| parent | Version bump as requested by Daniel Pinto dos Santos in bug #285794. Dropped ... (diff) | |
| download | gentoo-2-662477e1ddbc9b60b0c6277d85fb3bae3e57ec2d.tar.gz gentoo-2-662477e1ddbc9b60b0c6277d85fb3bae3e57ec2d.tar.bz2 gentoo-2-662477e1ddbc9b60b0c6277d85fb3bae3e57ec2d.zip | |
Don't try to autoconf when bootstrapping, bug #317915
(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)
| -rw-r--r-- | sys-devel/gcc-apple/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog index 20321bc33e87..60f36f8bf76d 100644 --- a/sys-devel/gcc-apple/ChangeLog +++ b/sys-devel/gcc-apple/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc-apple # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.15 2010/03/26 19:26:18 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.16 2010/05/02 14:53:45 grobian Exp $ + + 02 May 2010; Fabian Groffen <grobian@gentoo.org> + gcc-apple-4.2.1_p5647.ebuild: + Don't try to autoconf when bootstrapping, bug #317915 26 Mar 2010; Fabian Groffen <grobian@gentoo.org> gcc-apple-4.2.1_p5566-r2.ebuild, gcc-apple-4.2.1_p5574.ebuild, diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild index c0e058c04b58..5f253ad0de0d 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.8 2010/03/26 19:26:18 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.9 2010/05/02 14:53:45 grobian Exp $ EAPI="3" @@ -122,10 +122,14 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch eprefixify "${S}"/gcc/gcc.c - epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch - epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch - cd "${S}"/gcc && eautoconf - cd "${S}"/libgomp && eautoconf + if use !bootstrap ; then + # this only occurs with up-to-date tools from the Prefix, and actually + # breaks the bootstrap since the autoconf needs a very recent automake + epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch + epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch + cd "${S}"/gcc && eautoconf + cd "${S}"/libgomp && eautoconf + fi local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)" BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, } |