From a00eb48ca07ce05723121e5e24318367adc6704a Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 26 Jun 2021 16:44:19 -0400 Subject: [PATCH] meson-multilib.eclass: EAPI 8 support Signed-off-by: David Michael Signed-off-by: Mike Gilbert Closes: https://github.com/gentoo/gentoo/pull/21440 --- eclass/meson-multilib.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass index 01e14988463a0..fc1ef5802f937 100644 --- a/eclass/meson-multilib.eclass +++ b/eclass/meson-multilib.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Michał Górny # Author: Matt Turner -# @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