summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2021-06-26 16:44:19 -0400
committerMike Gilbert <floppym@gentoo.org>2021-07-02 11:32:35 -0400
commita00eb48ca07ce05723121e5e24318367adc6704a (patch)
tree2905fefaf6559cf44e24cae9b75f58c0291eb77d /eclass/meson-multilib.eclass
parentmultilib-minimal.eclass: EAPI 8 support (diff)
downloadgentoo-a00eb48ca07ce05723121e5e24318367adc6704a.tar.gz
gentoo-a00eb48ca07ce05723121e5e24318367adc6704a.tar.bz2
gentoo-a00eb48ca07ce05723121e5e24318367adc6704a.zip
meson-multilib.eclass: EAPI 8 support
Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Mike Gilbert <floppym@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/21440
Diffstat (limited to 'eclass/meson-multilib.eclass')
-rw-r--r--eclass/meson-multilib.eclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass
index 01e14988463a..fc1ef5802f93 100644
--- a/eclass/meson-multilib.eclass
+++ b/eclass/meson-multilib.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Author: Michał Górny <mgorny@gentoo.org>
# Author: Matt Turner <mattst88@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: meson wrapper for multilib builds
# @DESCRIPTION:
# The meson-multilib.eclass provides a glue between meson.eclass(5)
@@ -20,14 +20,14 @@
# in multilib-minimal, yet they ought to call appropriate meson
# phase rather than 'default'.
+case ${EAPI} in
+ 7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
if [[ -z ${_MESON_MULTILIB_ECLASS} ]] ; then
_MESON_MULTILIB_ECLASS=1
-case ${EAPI:-0} in
- 7) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
inherit meson multilib-minimal
EXPORT_FUNCTIONS src_configure src_compile src_test src_install