[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     d10179534fb46fb407853f0a8f1f73846e8c94c7
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 20:32:38 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 15:20:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1017953

meson.eclass: add MYMESONARGS variable

This was requested to allow users to pass aribtrary arguments to meson.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/meson.eclass | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 3e3a2e2f7a2..0932a7ed427 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -84,6 +84,11 @@ fi
 # Optional meson test arguments as Bash array; this should be defined before
 # calling meson_src_test.
 
+# @VARIABLE: MYMESONARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# User-controlled environment variable containing arguments to be passed to
+# meson in meson_src_configure.
 
 read -d '' __MESON_ARRAY_PARSER <<"EOF"
 import shlex
@@ -236,6 +241,9 @@ meson_src_configure() {
 
        BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
 
+       # Handle quoted whitespace
+       eval "local -a MYMESONARGS=( ${MYMESONARGS} )"
+
        mesonargs+=(
                # Arguments from ebuild
                "${emesonargs[@]}"
@@ -243,6 +251,9 @@ meson_src_configure() {
                # Arguments passed to this function
                "$@"
 
+               # Arguments from user
+               "${MYMESONARGS[@]}"
+
                # Source directory
                "${EMESON_SOURCE:-${S}}"