diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2014-05-21 20:39:21 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2014-05-21 20:39:21 +0000 |
| commit | 7be9a6f3b92ab3985d5264e364dcbdede64419d6 (patch) | |
| tree | 7941f145b8d1e208db3007cc7452f182518b5c08 /eclass | |
| parent | Version bump. Bug #510048 (diff) | |
| download | gentoo-2-7be9a6f3b92ab3985d5264e364dcbdede64419d6.tar.gz gentoo-2-7be9a6f3b92ab3985d5264e364dcbdede64419d6.tar.bz2 gentoo-2-7be9a6f3b92ab3985d5264e364dcbdede64419d6.zip | |
Revert libintl change. It turns out we need to depend on gettext anyways, so
this change is pointless.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6e9acb0c94f7..12c1b7d4d19b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1259 2014/05/20 10:41:23 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1260 2014/05/21 20:39:20 rhill Exp $ + + 21 May 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass: + Revert libintl change. It turns out we need to depend on gettext anyways, so + this change is pointless. 20 May 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass: Strip -mno-rtm and -mno-htm as libitm requires these for x86/x86_64 and diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 98fa117bcd54..62a1f32bde84 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.628 2014/05/20 10:41:23 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.629 2014/05/21 20:39:21 rhill Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -148,7 +148,7 @@ fi #---->> DEPEND <<---- RDEPEND="sys-libs/zlib - nls? ( virtual/libintl )" + nls? ( sys-devel/gettext )" tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" |