[gentoo-dev] [PATCH 0/2] meson.eclass updates

[gentoo-dev] [PATCH 0/2] meson.eclass updates

[William Hubbs]

All,

these are a couple of changes I think we can make to meson.eclass.

The first, removal of meson_auto_depend, makes sense because this is
no longer used by any ebuilds in the tree and any package using meson
needs the build-time dependencies in the eclass.

The second is an adjustment to an eapi test. This eclass dies for eapis
other than 6 or 7, so we don't need to worry about other eapis.

William Hubbs (2):
  meson.eclass: remove meson_auto_depend
  meson.eclass: remove unnecessary eapi checks

 eclass/meson.eclass | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

-- 
2.19.2

[gentoo-dev] [PATCH 1/2] meson.eclass: remove meson_auto_depend

[William Hubbs]

Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 eclass/meson.eclass | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 0a80c6b698b..1b080396626 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -39,16 +39,6 @@ case ${EAPI:-0} in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-if [[ ${__MESON_AUTO_DEPEND+set} == "set" ]] ; then
-	# See if we were included already, but someone changed the value
-	# of MESON_AUTO_DEPEND on us.  We could reload the entire
-	# eclass at that point, but that adds overhead, and it's trivial
-	# to re-order inherit in eclasses/ebuilds instead.  #409611
-	if [[ ${__MESON_AUTO_DEPEND} != ${MESON_AUTO_DEPEND} ]] ; then
-		die "MESON_AUTO_DEPEND changed value between inherits; please inherit meson.eclass first! ${__MESON_AUTO_DEPEND} -> ${MESON_AUTO_DEPEND}"
-	fi
-fi
-
 if [[ -z ${_MESON_ECLASS} ]]; then
 
 inherit ninja-utils python-utils-r1 toolchain-funcs
@@ -63,20 +53,11 @@ _MESON_ECLASS=1
 MESON_DEPEND=">=dev-util/meson-0.45.1
 	>=dev-util/ninja-1.7.2"
 
-# @ECLASS-VARIABLE: MESON_AUTO_DEPEND
-# @DESCRIPTION:
-# Set to 'no' to disable automatically adding to DEPEND.  This lets
-# ebuilds form conditional depends by using ${MESON_DEPEND} in
-# their own DEPEND string.
-: ${MESON_AUTO_DEPEND:=yes}
-if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then
-	if [[ ${EAPI:-0} == [0123456] ]]; then
-		DEPEND=${MESON_DEPEND}
-	else
-		BDEPEND=${MESON_DEPEND}
-	fi
+if [[ ${EAPI:-0} == [0123456] ]]; then
+	DEPEND=${MESON_DEPEND}
+else
+	BDEPEND=${MESON_DEPEND}
 fi
-__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
 
 # @ECLASS-VARIABLE: BUILD_DIR
 # @DEFAULT_UNSET
-- 
2.19.2

[gentoo-dev] [PATCH 2/2] meson.eclass: remove unnecessary eapi checks

[William Hubbs]

This eclass dies for all eapis other than 6 or 7, so we don't need to
test for eapis other than 6 or 7 anywhere else in the eclass.
---
 eclass/meson.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 1b080396626..159a987aff7 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -53,7 +53,7 @@ _MESON_ECLASS=1
 MESON_DEPEND=">=dev-util/meson-0.45.1
 	>=dev-util/ninja-1.7.2"
 
-if [[ ${EAPI:-0} == [0123456] ]]; then
+if [[ ${EAPI:-0} == [6] ]]; then
 	DEPEND=${MESON_DEPEND}
 else
 	BDEPEND=${MESON_DEPEND}
-- 
2.19.2

Re: [gentoo-dev] [PATCH 0/2] meson.eclass updates

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 48 bytes --]

All,

these have been pushed.

Thanks,

William

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]