| 1 |
commit: a5b3543d44f04c1e560ea622efa883f0196eee69 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 2 21:59:25 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 2 22:27:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b3543d |
| 7 |
|
| 8 |
toolchain.eclass: add support for EAPI=6 |
| 9 |
|
| 10 |
This is s small incremental change over EAPI=5. |
| 11 |
For example epatch() is still heavily used, we'll sort |
| 12 |
it out for EAPI=7. |
| 13 |
|
| 14 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 15 |
|
| 16 |
eclass/toolchain.eclass | 11 ++++++++--- |
| 17 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 20 |
index 68cf63887f2..be94db869d5 100644 |
| 21 |
--- a/eclass/toolchain.eclass |
| 22 |
+++ b/eclass/toolchain.eclass |
| 23 |
@@ -2,7 +2,7 @@ |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 27 |
-# @SUPPORTED_EAPIS: 5 |
| 28 |
+# @SUPPORTED_EAPIS: 5 6 |
| 29 |
|
| 30 |
DESCRIPTION="The GNU Compiler Collection" |
| 31 |
HOMEPAGE="https://gcc.gnu.org/" |
| 32 |
@@ -26,7 +26,7 @@ FEATURES=${FEATURES/multilib-strict/} |
| 33 |
|
| 34 |
case ${EAPI:-0} in |
| 35 |
0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;; |
| 36 |
- 5*) inherit eapi7-ver ;; |
| 37 |
+ 5*|6) inherit eapi7-ver ;; |
| 38 |
*) die "I don't speak EAPI ${EAPI}." ;; |
| 39 |
esac |
| 40 |
EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \ |
| 41 |
@@ -535,7 +535,12 @@ toolchain_src_prepare() { |
| 42 |
do_gcc_HTB_patches |
| 43 |
do_gcc_PIE_patches |
| 44 |
do_gcc_CYGWINPORTS_patches |
| 45 |
- epatch_user |
| 46 |
+ |
| 47 |
+ case ${EAPI:-0} in |
| 48 |
+ 5*) epatch_user;; |
| 49 |
+ 6) eapply_user ;; |
| 50 |
+ *) die "Update toolchain_src_prepare() for ${EAPI}." ;; |
| 51 |
+ esac |
| 52 |
|
| 53 |
if ( tc_version_is_at_least 4.8.2 || use_if_iuse hardened ) && ! use vanilla ; then |
| 54 |
make_gcc_hard |
Archives