- Drop the unused emesontestargs variable.

- Use the compile and install subcommands of meson instead of calling
ninja. This allows for the possibility of a different back end.

- Stop using the NINJAOPTS variable.

- Add --num-processes to "meson test" call regardless of whether MAKEOPTS
is set since the default is 1 process.

- Pass --jobs 0 instead of 999 to represent infinity.

- Echo commands before running them.
- Remove extraneous whitespace.
---
eclass/meson.eclass | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 2a563e367c6..8b22797da71 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -77,12 +77,6 @@ fi
# Optional meson arguments as Bash array; this should be defined before
# calling meson_src_configure.

-# @VARIABLE: emesontestargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional meson test arguments as Bash array; this should be defined before -# calling meson_src_test.
-
# @VARIABLE: MYMESONARGS
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -379,7 +373,17 @@ meson_src_configure() {
meson_src_compile() {
debug-print-function ${FUNCNAME} "$@"

- eninja -C "${BUILD_DIR}" "$@"
+ local mesoncompileargs=(
+ -C "${BUILD_DIR}"
+ --jobs "$(makeopts_jobs "${MAKEOPTS}" 0)"
+ --load-average "$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ --verbose
+ "$@"
+ )
+
+ set -- meson compile "${mesoncompileargs[@

On Wed, Aug 25, 2021 at 10:27:54AM -0500, William Hubbs wrote:

- Remove extraneous whitespace.

This will be removed from the commit message before I add the patch to
the tree, and a sign-off will be added.

Thanks,

William


-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQTVeuxEZo4uUHOkQAluVBb0MMRlOAUCYSZs4QAKCRBuVBb0MMRl OKLGAKC3vx5adDIR3vwhFhPokEMx3tuIFACeOTFr2e9Y8X91ikjVkybjK/TCK0w=
=KgAV
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On Wed, Aug 25, 2021 at 11:16:40AM -0500, William Hubbs wrote:

On Wed, Aug 25, 2021 at 10:27:54AM -0500, William Hubbs wrote:

- Remove extraneous whitespace.

This will be removed from the commit message before I add the patch to
the tree, and a sign-off will be added.

This is in the tree.

Thanks,

William

-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQTVeuxEZo4uUHOkQAluVBb0MMRlOAUCYSfNFAAKCRBuVBb0MMRl OOKiAKCbh62AkrKkkjO9qxg28rqQehcFvQCfQwZVbJPDdZkadexPMwWYJQbv5NY=
=Vn/B
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)