1 |
Signed-off-by: William Hubbs <williamh@g.o> |
2 |
--- |
3 |
eclass/meson.eclass | 27 ++++----------------------- |
4 |
1 file changed, 4 insertions(+), 23 deletions(-) |
5 |
|
6 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
7 |
index 0a80c6b698b..1b080396626 100644 |
8 |
--- a/eclass/meson.eclass |
9 |
+++ b/eclass/meson.eclass |
10 |
@@ -39,16 +39,6 @@ case ${EAPI:-0} in |
11 |
*) die "EAPI=${EAPI} is not supported" ;; |
12 |
esac |
13 |
|
14 |
-if [[ ${__MESON_AUTO_DEPEND+set} == "set" ]] ; then |
15 |
- # See if we were included already, but someone changed the value |
16 |
- # of MESON_AUTO_DEPEND on us. We could reload the entire |
17 |
- # eclass at that point, but that adds overhead, and it's trivial |
18 |
- # to re-order inherit in eclasses/ebuilds instead. #409611 |
19 |
- if [[ ${__MESON_AUTO_DEPEND} != ${MESON_AUTO_DEPEND} ]] ; then |
20 |
- die "MESON_AUTO_DEPEND changed value between inherits; please inherit meson.eclass first! ${__MESON_AUTO_DEPEND} -> ${MESON_AUTO_DEPEND}" |
21 |
- fi |
22 |
-fi |
23 |
- |
24 |
if [[ -z ${_MESON_ECLASS} ]]; then |
25 |
|
26 |
inherit ninja-utils python-utils-r1 toolchain-funcs |
27 |
@@ -63,20 +53,11 @@ _MESON_ECLASS=1 |
28 |
MESON_DEPEND=">=dev-util/meson-0.45.1 |
29 |
>=dev-util/ninja-1.7.2" |
30 |
|
31 |
-# @ECLASS-VARIABLE: MESON_AUTO_DEPEND |
32 |
-# @DESCRIPTION: |
33 |
-# Set to 'no' to disable automatically adding to DEPEND. This lets |
34 |
-# ebuilds form conditional depends by using ${MESON_DEPEND} in |
35 |
-# their own DEPEND string. |
36 |
-: ${MESON_AUTO_DEPEND:=yes} |
37 |
-if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then |
38 |
- if [[ ${EAPI:-0} == [0123456] ]]; then |
39 |
- DEPEND=${MESON_DEPEND} |
40 |
- else |
41 |
- BDEPEND=${MESON_DEPEND} |
42 |
- fi |
43 |
+if [[ ${EAPI:-0} == [0123456] ]]; then |
44 |
+ DEPEND=${MESON_DEPEND} |
45 |
+else |
46 |
+ BDEPEND=${MESON_DEPEND} |
47 |
fi |
48 |
-__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass |
49 |
|
50 |
# @ECLASS-VARIABLE: BUILD_DIR |
51 |
# @DEFAULT_UNSET |
52 |
-- |
53 |
2.19.2 |