summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-10-19 19:55:57 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2019-10-19 22:20:32 +0100
commitdfcb2b58bf94dc20eed8aa9780fc64df70710b6e (patch)
tree178eaf6976c9c78bafe33dff80b5488a9537b855 /eclass/toolchain.eclass
parenttoolchain.eclass: isolate 'epatch' into 'tc_apply_patches' (diff)
downloadgentoo-dfcb2b58bf94dc20eed8aa9780fc64df70710b6e.tar.gz
gentoo-dfcb2b58bf94dc20eed8aa9780fc64df70710b6e.tar.bz2
gentoo-dfcb2b58bf94dc20eed8aa9780fc64df70710b6e.zip
toolchain.eclass: port to EAPI=7
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 32483555b051..6f70d8061006 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
DESCRIPTION="The GNU Compiler Collection"
HOMEPAGE="https://gcc.gnu.org/"
@@ -27,6 +27,7 @@ FEATURES=${FEATURES/multilib-strict/}
case ${EAPI:-0} in
0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;;
5*|6) inherit eapi7-ver ;;
+ 7) ;;
*) die "I don't speak EAPI ${EAPI}." ;;
esac
EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
@@ -512,6 +513,7 @@ tc_apply_patches() {
# Note: even for EAPI=6 we used 'epatch' semantics. To avoid
# breaking existing ebuilds use 'eapply' only in EAPI=7 or later.
5*|6) epatch "$@" ;;
+ 7) eapply "$@" ;;
*) die "Update apply_patches() for ${EAPI}." ;;
esac
}
@@ -527,7 +529,7 @@ toolchain_src_prepare() {
case ${EAPI:-0} in
5*) epatch_user;;
- 6) eapply_user ;;
+ 6|7) eapply_user ;;
*) die "Update toolchain_src_prepare() for ${EAPI}." ;;
esac