| 1 |
vapier 15/06/01 07:04:04 |
| 2 |
|
| 3 |
Modified: toolchain.eclass |
| 4 |
Log: |
| 5 |
drop EAPI=0 & EAPI=1 support |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.673 eclass/toolchain.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.673&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.673&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.672&r2=1.673 |
| 13 |
|
| 14 |
Index: toolchain.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 17 |
retrieving revision 1.672 |
| 18 |
retrieving revision 1.673 |
| 19 |
diff -u -r1.672 -r1.673 |
| 20 |
--- toolchain.eclass 27 May 2015 10:29:03 -0000 1.672 |
| 21 |
+++ toolchain.eclass 1 Jun 2015 07:04:04 -0000 1.673 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2015 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.672 2015/05/27 10:29:03 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.673 2015/06/01 07:04:04 vapier Exp $ |
| 27 |
|
| 28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 29 |
|
| 30 |
@@ -26,7 +26,7 @@ |
| 31 |
|
| 32 |
EXPORTED_FUNCTIONS="pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm" |
| 33 |
case ${EAPI:-0} in |
| 34 |
- 0|1) ;; |
| 35 |
+ 0|1) die "Need to upgrade to at least EAPI=2";; |
| 36 |
2|3) EXPORTED_FUNCTIONS+=" src_prepare src_configure" ;; |
| 37 |
4*|5*) EXPORTED_FUNCTIONS+=" pkg_pretend src_prepare src_configure" ;; |
| 38 |
*) die "I don't speak EAPI ${EAPI}." |
| 39 |
@@ -154,8 +154,7 @@ |
| 40 |
tc_version_is_at_least 4.9 && IUSE+=" cilk" |
| 41 |
fi |
| 42 |
|
| 43 |
-[[ ${EAPI:-0} != 0 ]] && IUSE_DEF=( "${IUSE_DEF[@]/#/+}" ) |
| 44 |
-IUSE+=" ${IUSE_DEF[*]}" |
| 45 |
+IUSE+=" ${IUSE_DEF[*]/#/+}" |
| 46 |
|
| 47 |
# Support upgrade paths here or people get pissed |
| 48 |
if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then |
| 49 |
@@ -391,8 +390,8 @@ |
| 50 |
#---->> pkg_setup <<---- |
| 51 |
|
| 52 |
toolchain_pkg_setup() { |
| 53 |
- case "${EAPI:-0}" in |
| 54 |
- 0|1|2|3) toolchain_pkg_pretend ;; |
| 55 |
+ case ${EAPI} in |
| 56 |
+ 2|3) toolchain_pkg_pretend ;; |
| 57 |
esac |
| 58 |
|
| 59 |
# we dont want to use the installed compiler's specs to build gcc |
| 60 |
@@ -408,10 +407,6 @@ |
| 61 |
else |
| 62 |
gcc_quick_unpack |
| 63 |
fi |
| 64 |
- |
| 65 |
- case ${EAPI:-0} in |
| 66 |
- 0|1) toolchain_src_prepare ;; |
| 67 |
- esac |
| 68 |
} |
| 69 |
|
| 70 |
gcc_quick_unpack() { |
| 71 |
@@ -1498,10 +1493,6 @@ |
| 72 |
#----> src_compile <---- |
| 73 |
|
| 74 |
toolchain_src_compile() { |
| 75 |
- case ${EAPI:-0} in |
| 76 |
- 0|1) toolchain_src_configure ;; |
| 77 |
- esac |
| 78 |
- |
| 79 |
touch "${S}"/gcc/c-gperf.h |
| 80 |
|
| 81 |
# Do not make manpages if we do not have perl ... |
Archives