diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
| commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
| tree | cee0a97398040001220ece3cd48c3d568bcddb4a /eclass/meson.eclass | |
| parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) | |
gentoo resync : 10.02.2019
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 0a80c6b698b9..75291d7bdd1b 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -39,16 +39,6 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac -if [[ ${__MESON_AUTO_DEPEND+set} == "set" ]] ; then - # See if we were included already, but someone changed the value - # of MESON_AUTO_DEPEND on us. We could reload the entire - # eclass at that point, but that adds overhead, and it's trivial - # to re-order inherit in eclasses/ebuilds instead. #409611 - if [[ ${__MESON_AUTO_DEPEND} != ${MESON_AUTO_DEPEND} ]] ; then - die "MESON_AUTO_DEPEND changed value between inherits; please inherit meson.eclass first! ${__MESON_AUTO_DEPEND} -> ${MESON_AUTO_DEPEND}" - fi -fi - if [[ -z ${_MESON_ECLASS} ]]; then inherit ninja-utils python-utils-r1 toolchain-funcs @@ -60,23 +50,14 @@ EXPORT_FUNCTIONS src_configure src_compile src_test src_install if [[ -z ${_MESON_ECLASS} ]]; then _MESON_ECLASS=1 -MESON_DEPEND=">=dev-util/meson-0.45.1 +MESON_DEPEND=">=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2" -# @ECLASS-VARIABLE: MESON_AUTO_DEPEND -# @DESCRIPTION: -# Set to 'no' to disable automatically adding to DEPEND. This lets -# ebuilds form conditional depends by using ${MESON_DEPEND} in -# their own DEPEND string. -: ${MESON_AUTO_DEPEND:=yes} -if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then - if [[ ${EAPI:-0} == [0123456] ]]; then - DEPEND=${MESON_DEPEND} - else - BDEPEND=${MESON_DEPEND} - fi +if [[ ${EAPI:-0} == [6] ]]; then + DEPEND=${MESON_DEPEND} +else + BDEPEND=${MESON_DEPEND} fi -__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass # @ECLASS-VARIABLE: BUILD_DIR # @DEFAULT_UNSET |