diff options
| author |   David Michael <fedora.dm0@gmail.com> | 2021-06-24 11:25:03 -0400 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2021-06-28 13:23:19 -0400 |
| commit | cc7d0d075fe7fc9e3228eb7c108c122b855fd8b8 (patch) | |
| tree | 8c4c5a0d2e2cb5173c5d5ef97252dba1f9b562bb | |
| parent | ninja-utils.eclass: EAPI 8 support (diff) | |
| download | gentoo-cc7d0d07.tar.gz gentoo-cc7d0d07.tar.bz2 gentoo-cc7d0d07.zip | |
meson.eclass: EAPI 8 support
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | eclass/meson.eclass | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index c9a5e0b5956d..a0b3906078ce 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # William Hubbs <williamh@gentoo.org> # Mike Gilbert <floppym@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: common ebuild functions for meson-based packages # @DESCRIPTION: # This eclass contains the default phase functions for packages which @@ -15,7 +15,7 @@ # Typical ebuild using meson.eclass: # # @CODE -# EAPI=6 +# EAPI=8 # # inherit meson # @@ -23,7 +23,7 @@ # # src_configure() { # local emesonargs=( -# $(meson_use qt4) +# $(meson_use qt5) # $(meson_feature threads) # $(meson_use bindist official_branding) # ) @@ -34,32 +34,25 @@ # # @CODE -case ${EAPI:-0} in - 6|7) ;; - *) die "EAPI=${EAPI} is not supported" ;; +case ${EAPI} in + 6|7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_MESON_ECLASS} ]]; then +_MESON_ECLASS=1 +[[ ${EAPI} == 6 ]] && inherit eapi7-ver inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs -if [[ ${EAPI} == 6 ]]; then - inherit eapi7-ver -fi - -fi - EXPORT_FUNCTIONS src_configure src_compile src_test src_install -if [[ -z ${_MESON_ECLASS} ]]; then -_MESON_ECLASS=1 - MESON_DEPEND=">=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array " -if [[ ${EAPI:-0} == [6] ]]; then +if [[ ${EAPI} == 6 ]]; then DEPEND=${MESON_DEPEND} else BDEPEND=${MESON_DEPEND} |