Signed-off-by: William Hubbs <[email protected]>
---
eclass/meson.eclass | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 0a80c6b698b..1b080396626 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
@@ -63,20 +53,11 @@ _MESON_ECLASS=1
MESON_DEPEND=">=dev-util/meson-0.45.1
>=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} == [0123456] ]]; 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
--
2.19.2
