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-binutils.eclass
Date: Thu, 28 Jan 2010 00:25:26
Message-Id: E1NaICI-0007Tp-OX@stork.gentoo.org
1 vapier 10/01/28 00:25:22
2
3 Modified: toolchain-binutils.eclass
4 Log:
5 drop USE=gold and enable bfd/gold all the time (with bfd being the default) ... this implies dropping gold support in older binutils, but screw em #301480
6
7 Revision Changes Path
8 1.89 eclass/toolchain-binutils.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.89&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.89&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.88&r2=1.89
13
14 Index: toolchain-binutils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v
17 retrieving revision 1.88
18 retrieving revision 1.89
19 diff -u -r1.88 -r1.89
20 --- toolchain-binutils.eclass 24 Dec 2009 13:16:16 -0000 1.88
21 +++ toolchain-binutils.eclass 28 Jan 2010 00:25:22 -0000 1.89
22 @@ -1,6 +1,6 @@
23 -# Copyright 1999-2009 Gentoo Foundation
24 +# Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.88 2009/12/24 13:16:16 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.89 2010/01/28 00:25:22 vapier Exp $
28 #
29 # Maintainer: Toolchain Ninjas <toolchain@g.o>
30 #
31 @@ -75,7 +75,7 @@
32 else
33 LICENSE="|| ( GPL-2 LGPL-2 )"
34 fi
35 -IUSE="gold nls multitarget multislot test vanilla"
36 +IUSE="nls multitarget multislot test vanilla"
37 if use multislot ; then
38 SLOT="${CTARGET}-${BVER}"
39 elif is_cross ; then
40 @@ -195,11 +195,9 @@
41
42 cd "${MY_BUILDDIR}"
43 local myconf=""
44 - # new versions allow gold and ld while older allowed only one
45 - if grep -q 'gold.*yes,both' "${S}"/configure ; then
46 - myconf="${myconf} $(use_enable gold gold both) --enable-linker=bfd"
47 - else
48 - myconf="${myconf} $(use_enable gold)"
49 + # new versions allow gold and ld; screw older versions
50 + if grep -q 'enable-gold=both/bfd' "${S}"/configure ; then
51 + myconf="${myconf} --enable-gold=both/bfd"
52 fi
53 use nls \
54 && myconf="${myconf} --without-included-gettext" \