| 1 |
commit: f3310726c78a5ef32ebc1829980e716fa429c32b |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Wed Jul 11 00:40:44 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 23 14:47:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3310726 |
| 7 |
|
| 8 |
meson.eclass: add EAPI 7 support |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/meson.eclass | 12 ++++++++---- |
| 13 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 16 |
index ebc2c02ca8e..3d886536330 100644 |
| 17 |
--- a/eclass/meson.eclass |
| 18 |
+++ b/eclass/meson.eclass |
| 19 |
@@ -1,11 +1,11 @@ |
| 20 |
-# Copyright 2017 Gentoo Foundation |
| 21 |
+# Copyright 2017-2018 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
# @ECLASS: meson.eclass |
| 25 |
# @MAINTAINER: |
| 26 |
# William Hubbs <williamh@g.o> |
| 27 |
# Mike Gilbert <floppym@g.o> |
| 28 |
-# @SUPPORTED_EAPIS: 6 |
| 29 |
+# @SUPPORTED_EAPIS: 6 7 |
| 30 |
# @BLURB: common ebuild functions for meson-based packages |
| 31 |
# @DESCRIPTION: |
| 32 |
# This eclass contains the default phase functions for packages which |
| 33 |
@@ -35,7 +35,7 @@ |
| 34 |
# @CODE |
| 35 |
|
| 36 |
case ${EAPI:-0} in |
| 37 |
- 6) ;; |
| 38 |
+ 6|7) ;; |
| 39 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 40 |
esac |
| 41 |
|
| 42 |
@@ -70,7 +70,11 @@ MESON_DEPEND=">=dev-util/meson-0.45.1 |
| 43 |
# their own DEPEND string. |
| 44 |
: ${MESON_AUTO_DEPEND:=yes} |
| 45 |
if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then |
| 46 |
- DEPEND=${MESON_DEPEND} |
| 47 |
+ if [[ ${EAPI:-0} == [0123456] ]]; then |
| 48 |
+ DEPEND=${MESON_DEPEND} |
| 49 |
+ else |
| 50 |
+ BDEPEND=${MESON_DEPEND} |
| 51 |
+ fi |
| 52 |
fi |
| 53 |
__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass |
Archives