* [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support
@ 2018-07-11 0:40 Marty E. Plummer
2018-09-23 14:47 ` Mike Gilbert
0 siblings, 1 reply; 2+ messages in thread
From: Marty E. Plummer @ 2018-07-11 0:40 UTC (permalink / raw
To: gentoo-dev; +Cc: Marty E. Plummer
---
It seems this is all that is needed, and all the eclasses inherited by
it are supported for EAPI 7. I could be missing something, so please do
comment if I have.
eclass/meson.eclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index f2202a04593..7c5b3da6ffa 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -34,7 +34,7 @@
# @CODE
case ${EAPI:-0} in
- 6) ;;
+ 6|7) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
@@ -69,7 +69,11 @@ MESON_DEPEND=">=dev-util/meson-0.40.0
# their own DEPEND string.
: ${MESON_AUTO_DEPEND:=yes}
if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then
- DEPEND=${MESON_DEPEND}
+ if [[ ${EAPI:-0} == [0123456] ]]; then
+ DEPEND=${MESON_DEPEND}
+ else
+ BDEPEND=${MESON_DEPEND}
+ fi
fi
__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support
2018-07-11 0:40 [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support Marty E. Plummer
@ 2018-09-23 14:47 ` Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2018-09-23 14:47 UTC (permalink / raw
To: Gentoo Dev; +Cc: hanetzer
On Tue, Jul 10, 2018 at 8:40 PM Marty E. Plummer <hanetzer@startmail.com> wrote:
> It seems this is all that is needed, and all the eclasses inherited by
> it are supported for EAPI 7. I could be missing something, so please do
> comment if I have.
I pushed this, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-23 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-11 0:40 [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support Marty E. Plummer
2018-09-23 14:47 ` Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox