[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     c7c6ead31a2d6047ef2d3dd3fb60182f1456124f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 17:05:07 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 17:05:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c6ead3

dev-util/meson: accept floating point values for load-average

Closes: https://bugs.gentoo.org/810655
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 ...on-mcompile-treat-load-average-as-a-float.patch | 28 ++++++++++++++++++++++
 ...{meson-0.58.2.ebuild => meson-0.58.2-r1.ebuild} |  4 ++++
 ...{meson-0.59.1.ebuild => meson-0.59.1-r1.ebuild} |  4 ++++
 3 files changed, 36 insertions(+)

diff --git a/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch b/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch
new file mode 100644
index 00000000000..9effb382be2
--- /dev/null
+++ b/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch
@@ -0,0 +1,28 @@
+From bb07c850c77e2bd07e1261547bc6b1e6b024f31d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 27 Aug 2021 10:17:14 -0400
+Subject: [PATCH] mcompile: treat load-average as a float
+
+`ninja -l` accepts a double. We should do the same.
+
+Bug: https://bugs.gentoo.org/810655
+---
+ mesonbuild/mcompile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py
+index bb7ecae9b..e20485c76 100644
+--- a/mesonbuild/mcompile.py
++++ b/mesonbuild/mcompile.py
+@@ -305,7 +305,7 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None:
+         '-l', '--load-average',
+         action='store',
+         default=0,
+-        type=int,
++        type=float,
+         help='The system load average to try to maintain (if supported).'
+     )
+     parser.add_argument(
+-- 
+2.33.0
+

diff --git a/dev-util/meson/meson-0.58.2.ebuild b/dev-util/meson/meson-0.58.2-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.58.2.ebuild
rename to dev-util/meson/meson-0.58.2-r1.ebuild
index 3056c22a3bd..0b7b12ebfbb 100644
--- a/dev-util/meson/meson-0.58.2.ebuild
+++ b/dev-util/meson/meson-0.58.2-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD

diff --git a/dev-util/meson/meson-0.59.1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.59.1.ebuild
rename to dev-util/meson/meson-0.59.1-r1.ebuild
index e2a175666ca..5d637ceeedd 100644
--- a/dev-util/meson/meson-0.59.1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD