summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-08-27 13:05:07 -0400
committerMike Gilbert <floppym@gentoo.org>2021-08-27 13:05:07 -0400
commitc7c6ead31a2d6047ef2d3dd3fb60182f1456124f (patch)
tree899bad0d96806050e418fe4dab13ce16d8a5619b /dev-util
parentdev-python/qtsass: enable py3.10 (diff)
downloadgentoo-c7c6ead31a2d6047ef2d3dd3fb60182f1456124f.tar.gz
gentoo-c7c6ead31a2d6047ef2d3dd3fb60182f1456124f.tar.bz2
gentoo-c7c6ead31a2d6047ef2d3dd3fb60182f1456124f.zip
dev-util/meson: accept floating point values for load-average
Closes: https://bugs.gentoo.org/810655 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch28
-rw-r--r--dev-util/meson/meson-0.58.2-r1.ebuild (renamed from dev-util/meson/meson-0.58.2.ebuild)4
-rw-r--r--dev-util/meson/meson-0.59.1-r1.ebuild (renamed from dev-util/meson/meson-0.59.1.ebuild)4
3 files changed, 36 insertions, 0 deletions
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 000000000000..9effb382be22
--- /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
index 3056c22a3bd1..0b7b12ebfbb7 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
index e2a175666ca3..5d637ceeeddc 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