| 1 |
--- |
| 2 |
|
| 3 |
It seems this is all that is needed, and all the eclasses inherited by |
| 4 |
it are supported for EAPI 7. I could be missing something, so please do |
| 5 |
comment if I have. |
| 6 |
eclass/meson.eclass | 8 ++++++-- |
| 7 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 10 |
index f2202a04593..7c5b3da6ffa 100644 |
| 11 |
--- a/eclass/meson.eclass |
| 12 |
+++ b/eclass/meson.eclass |
| 13 |
@@ -34,7 +34,7 @@ |
| 14 |
# @CODE |
| 15 |
|
| 16 |
case ${EAPI:-0} in |
| 17 |
- 6) ;; |
| 18 |
+ 6|7) ;; |
| 19 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 20 |
esac |
| 21 |
|
| 22 |
@@ -69,7 +69,11 @@ MESON_DEPEND=">=dev-util/meson-0.40.0 |
| 23 |
# their own DEPEND string. |
| 24 |
: ${MESON_AUTO_DEPEND:=yes} |
| 25 |
if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then |
| 26 |
- DEPEND=${MESON_DEPEND} |
| 27 |
+ if [[ ${EAPI:-0} == [0123456] ]]; then |
| 28 |
+ DEPEND=${MESON_DEPEND} |
| 29 |
+ else |
| 30 |
+ BDEPEND=${MESON_DEPEND} |
| 31 |
+ fi |
| 32 |
fi |
| 33 |
__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass |
| 34 |
|
| 35 |
-- |
| 36 |
2.18.0 |
Archives