Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
Date: Sat, 03 Mar 2012 22:42:57
Message-Id: 20120303224247.364862004B@flycatcher.gentoo.org
1 vapier 12/03/03 22:42:47
2
3 Modified: toolchain.eclass
4 Log:
5 add a useful default DESCRIPTION, do not set a release tarball for 9999 versions, and move I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS check here to avoid copying to all snapshot/live ebuilds
6
7 Revision Changes Path
8 1.522 eclass/toolchain.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.522&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.522&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.521&r2=1.522
13
14 Index: toolchain.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17 retrieving revision 1.521
18 retrieving revision 1.522
19 diff -u -r1.521 -r1.522
20 --- toolchain.eclass 3 Mar 2012 02:47:11 -0000 1.521
21 +++ toolchain.eclass 3 Mar 2012 22:42:47 -0000 1.522
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2012 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.521 2012/03/03 02:47:11 dirtyepic Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.522 2012/03/03 22:42:47 vapier Exp $
27 #
28 # Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30 @@ -12,7 +12,7 @@
31 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils
32
33 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
34 -DESCRIPTION="Based on the ${ECLASS} eclass"
35 +DESCRIPTION="The GNU Compiler Collection"
36
37 FEATURES=${FEATURES/multilib-strict/}
38 #----<< eclass stuff >>----
39 @@ -262,7 +262,7 @@
40 GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
41 elif [[ -n ${SNAPSHOT} ]] ; then
42 GCC_SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
43 - else
44 + elif [[ ${PV} != *9999* ]] ; then
45 GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
46 # we want all branch updates to be against the main release
47 [[ -n ${BRANCH_UPDATE} ]] && \
48 @@ -533,6 +533,13 @@
49
50 #---->> pkg_* <<----
51 toolchain_pkg_setup() {
52 + if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] &&
53 + [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]]
54 + then
55 + die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it in your make.conf if you want to use this version." \
56 + "This is to try and cut down on people filing bugs for a compiler we do not currently support."
57 + fi
58 +
59 # Setup variables which would normally be in the profile
60 if is_crosscompile ; then
61 multilib_env ${CTARGET}