public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download: 
* [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support
@ 2018-07-11  0:40 99% Marty E. Plummer
  0 siblings, 0 replies; 1+ results
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	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-07-11  0:40 99% [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support Marty E. Plummer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox