From ac4bf5fe8d9e4077e2c1806086aebfc368ea28e1 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 2 May 2010 14:53:45 +0000 Subject: Don't try to autoconf when bootstrapping, bug #317915 Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc --- sys-devel/gcc-apple/ChangeLog | 6 +++++- sys-devel/gcc-apple/Manifest | 4 ++-- sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild | 14 +++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'sys-devel/gcc-apple') 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 + gcc-apple-4.2.1_p5647.ebuild: + Don't try to autoconf when bootstrapping, bug #317915 26 Mar 2010; Fabian Groffen gcc-apple-4.2.1_p5566-r2.ebuild, gcc-apple-4.2.1_p5574.ebuild, diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest index ce630ec5926e..61a95a2b5551 100644 --- a/sys-devel/gcc-apple/Manifest +++ b/sys-devel/gcc-apple/Manifest @@ -25,6 +25,6 @@ EBUILD gcc-apple-4.0.1_p5493.ebuild 8542 RMD160 e53dadf5d96ca4bb89494ed0f032e1db EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10829 RMD160 8999218072ec2f98dca8bb77f9e74c43c414ecc2 SHA1 db70b5dc4b07bb0bad23a08ffea6f2170bc66afb SHA256 9222690406b3ef9f648b89665a1f1a609da5f823a7f368bdd1e844cfceba188f EBUILD gcc-apple-4.2.1_p5574.ebuild 10843 RMD160 954e8e1dda7435ed9239aef0a31c22a251299e52 SHA1 52bb5ec4865474177592587f617fa9e112439c91 SHA256 c45309947cdff4e24cc127526ff650585788f569b1200fe3e11e1ecc29b33cdd EBUILD gcc-apple-4.2.1_p5646.ebuild 11284 RMD160 fa8565150fcae722e94f0d2e83f54f0206926dc8 SHA1 8e83b44349bc7f0daa7ccb2db917183ddca78a2d SHA256 682aaca8906ab9b23d2c58b37bdbbcd38c3c1422baef6a77008bfa855da94590 -EBUILD gcc-apple-4.2.1_p5647.ebuild 11324 RMD160 8fcc6fff79ab8c24669879e72a1f16285daea9e3 SHA1 74bff25a08ca9e75562c81b59ba9d9c25e33aa1d SHA256 26214ce1a90064cf86e740e752067a6c838da1238b9985a083e92222329a48b5 -MISC ChangeLog 11582 RMD160 936babe949e1b4695be2137a57689b8152545a20 SHA1 97baaff74d2ee869e19e39aeeaea9b137e18852b SHA256 4dd434ec25ff8f6d575b7183db13b35440940f184d7f7357a379690f018ec0cf +EBUILD gcc-apple-4.2.1_p5647.ebuild 11504 RMD160 24014bc83b6bb5e485c53750e1012ecbb56d89bf SHA1 ad7ec68383a0670f45c0c80212f4ceae028efbef SHA256 77a5849b0a9b82a893dbe12f642b598df1c76cbfb3b6eca8cc610a21d9745f3e +MISC ChangeLog 11722 RMD160 a35b516cca86c347df5a857cb92dabfa4060308b SHA1 265c49d14d1fb18b866eec68b3aed4920888ba03 SHA256 642a36a60a252ef203e65f1e919e12e87bee28b9b4fe30f02d42cb41fe8348e2 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517 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}, } -- cgit v1.2.3-65-gdbad