| 1 |
vapier 11/09/27 12:14:25 |
| 2 |
|
| 3 |
Modified: toolchain.eclass |
| 4 |
Log: |
| 5 |
add common depend settings |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.472 eclass/toolchain.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.472&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.472&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.471&r2=1.472 |
| 13 |
|
| 14 |
Index: toolchain.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 17 |
retrieving revision 1.471 |
| 18 |
retrieving revision 1.472 |
| 19 |
diff -u -r1.471 -r1.472 |
| 20 |
--- toolchain.eclass 26 Sep 2011 20:39:53 -0000 1.471 |
| 21 |
+++ toolchain.eclass 27 Sep 2011 12:14:25 -0000 1.472 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2011 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.471 2011/09/26 20:39:53 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.472 2011/09/27 12:14:25 vapier Exp $ |
| 27 |
# |
| 28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 29 |
|
| 30 |
@@ -81,14 +81,10 @@ |
| 31 |
|
| 32 |
|
| 33 |
#---->> SLOT+IUSE logic <<---- |
| 34 |
-IUSE="multislot nptl test" |
| 35 |
- |
| 36 |
-if tc_version_is_at_least 3 ; then |
| 37 |
- IUSE+=" vanilla" |
| 38 |
-fi |
| 39 |
+IUSE="build multislot nls nptl test vanilla" |
| 40 |
|
| 41 |
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then |
| 42 |
- IUSE+=" altivec build fortran nls nocxx" |
| 43 |
+ IUSE+=" altivec fortran nocxx" |
| 44 |
[[ -n ${PIE_VER} ]] && IUSE+=" nopie" |
| 45 |
[[ -n ${PP_VER} ]] && IUSE+=" nossp" |
| 46 |
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp" |
| 47 |
@@ -121,6 +117,44 @@ |
| 48 |
fi |
| 49 |
#----<< SLOT+IUSE logic >>---- |
| 50 |
|
| 51 |
+#---->> DEPEND <<---- |
| 52 |
+ |
| 53 |
+RDEPEND="sys-libs/zlib |
| 54 |
+ !build? ( |
| 55 |
+ nls? ( sys-devel/gettext ) |
| 56 |
+ )" |
| 57 |
+if tc_version_is_at_least 3 ; then |
| 58 |
+ RDEPEND+=" virtual/libiconv" |
| 59 |
+fi |
| 60 |
+if tc_version_is_at_least 4 ; then |
| 61 |
+ RDEPEND+=" >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2" |
| 62 |
+ if tc_version_is_at_least 4.5 ; then |
| 63 |
+ RDEPEND+=" >=dev-libs/mpc-0.8.1" |
| 64 |
+ fi |
| 65 |
+fi |
| 66 |
+if has graphite ${IUSE} ; then |
| 67 |
+ RDEPEND+=" |
| 68 |
+ graphite? ( |
| 69 |
+ >=dev-libs/cloog-ppl-0.15.10 |
| 70 |
+ >=dev-libs/ppl-0.10 |
| 71 |
+ )" |
| 72 |
+fi |
| 73 |
+ |
| 74 |
+DEPEND="${RDEPEND} |
| 75 |
+ >=sys-apps/texinfo-4.8 |
| 76 |
+ >=sys-devel/bison-1.875 |
| 77 |
+ >=sys-devel/flex-2.5.4 |
| 78 |
+ test? ( |
| 79 |
+ >=dev-util/dejagnu-1.4.4 |
| 80 |
+ >=sys-devel/autogen-5.5.4 |
| 81 |
+ )" |
| 82 |
+if tc_version_is_at_least 4.2 && has gcj ${IUSE} ; then |
| 83 |
+ DEPEND+=" gcj? ( app-arch/zip app-arch/unzip )" |
| 84 |
+fi |
| 85 |
+ |
| 86 |
+PDEPEND=">=sys-devel/gcc-config-1.4" |
| 87 |
+ |
| 88 |
+#----<< DEPEND >>---- |
| 89 |
|
| 90 |
#---->> S + SRC_URI essentials <<---- |
Archives