commit: 8f6a71af8d9acc72c37c30f4b02321579c6346f3 Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Tue Nov 11 20:52:36 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Tue Nov 11 20:52:36 2025 +0000 URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=8f6a71af
fix incompatible MAKEOPTS spelling of --load-average multiprocessing.eclass has no idea what the minimum unique prefix for a given make option is. Make accepts --load-average and also --load or --loa or even --l, because it is the only current double-dash starts-with-l option today. But if they added another one, our make.conf would fail, and multiprocessing.eclass ignores it anyway. ninja-utils.eclass depends on parsing load-average out of MAKEOPTS and passing it to `ninja`. We were never setting -l for ebuilds using ninja, unfortunately. Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> builders/dola/gnome-23/portage/env/lessmemory.conf | 2 +- builders/dola/gnome-23/portage/make.conf | 4 ++-- builders/dola/kde-23/portage/env/lessmemory.conf | 2 +- builders/dola/kde-23/portage/make.conf | 4 ++-- builders/dola/server-23/portage/env/lessmemory.conf | 2 +- builders/dola/server-23/portage/make.conf | 4 ++-- builders/milou/gnome-23/portage/make.conf | 2 +- builders/milou/gnome-v3-23/portage/make.conf | 2 +- builders/milou/kde-23/portage/make.conf | 2 +- builders/milou/kde-v3-23/portage/make.conf | 2 +- builders/milou/openrc-23/portage/make.conf | 2 +- builders/milou/openrc-v3-23/portage/make.conf | 2 +- builders/milou/server-23/portage/make.conf | 2 +- builders/milou/server-v3-23/portage/make.conf | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/builders/dola/gnome-23/portage/env/lessmemory.conf b/builders/dola/gnome-23/portage/env/lessmemory.conf index 3678aee..12381c1 100644 --- a/builders/dola/gnome-23/portage/env/lessmemory.conf +++ b/builders/dola/gnome-23/portage/env/lessmemory.conf @@ -1 +1 @@ -MAKEOPTS="-j20 --load 160.0" +MAKEOPTS="-j20 --load-average 160.0" diff --git a/builders/dola/gnome-23/portage/make.conf b/builders/dola/gnome-23/portage/make.conf index aee8b06..e4ac952 100644 --- a/builders/dola/gnome-23/portage/make.conf +++ b/builders/dola/gnome-23/portage/make.conf @@ -22,9 +22,9 @@ PKGDIR="/var/cache/binpkgs" # Please keep this setting intact when reporting bugs. LC_MESSAGES=C -MAKEOPTS="-j80 --load 80" +MAKEOPTS="-j80 --load-average 80" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 80 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/dola/kde-23/portage/env/lessmemory.conf b/builders/dola/kde-23/portage/env/lessmemory.conf index 3678aee..12381c1 100644 --- a/builders/dola/kde-23/portage/env/lessmemory.conf +++ b/builders/dola/kde-23/portage/env/lessmemory.conf @@ -1 +1 @@ -MAKEOPTS="-j20 --load 160.0" +MAKEOPTS="-j20 --load-average 160.0" diff --git a/builders/dola/kde-23/portage/make.conf b/builders/dola/kde-23/portage/make.conf index f52281e..74f3aea 100644 --- a/builders/dola/kde-23/portage/make.conf +++ b/builders/dola/kde-23/portage/make.conf @@ -22,9 +22,9 @@ PKGDIR="/var/cache/binpkgs" # Please keep this setting intact when reporting bugs. LC_MESSAGES=C -MAKEOPTS="-j80 --load 80" +MAKEOPTS="-j80 --load-average 80" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 80 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/dola/server-23/portage/env/lessmemory.conf b/builders/dola/server-23/portage/env/lessmemory.conf index 3678aee..12381c1 100644 --- a/builders/dola/server-23/portage/env/lessmemory.conf +++ b/builders/dola/server-23/portage/env/lessmemory.conf @@ -1 +1 @@ -MAKEOPTS="-j20 --load 160.0" +MAKEOPTS="-j20 --load-average 160.0" diff --git a/builders/dola/server-23/portage/make.conf b/builders/dola/server-23/portage/make.conf index f52281e..74f3aea 100644 --- a/builders/dola/server-23/portage/make.conf +++ b/builders/dola/server-23/portage/make.conf @@ -22,9 +22,9 @@ PKGDIR="/var/cache/binpkgs" # Please keep this setting intact when reporting bugs. LC_MESSAGES=C -MAKEOPTS="-j80 --load 80" +MAKEOPTS="-j80 --load-average 80" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 80 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/gnome-23/portage/make.conf b/builders/milou/gnome-23/portage/make.conf index 985a888..3079b30 100644 --- a/builders/milou/gnome-23/portage/make.conf +++ b/builders/milou/gnome-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/gnome-v3-23/portage/make.conf b/builders/milou/gnome-v3-23/portage/make.conf index 701eb08..6391bc8 100644 --- a/builders/milou/gnome-v3-23/portage/make.conf +++ b/builders/milou/gnome-v3-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/kde-23/portage/make.conf b/builders/milou/kde-23/portage/make.conf index 08eeeba..12932a6 100644 --- a/builders/milou/kde-23/portage/make.conf +++ b/builders/milou/kde-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/kde-v3-23/portage/make.conf b/builders/milou/kde-v3-23/portage/make.conf index 9e5834e..4a53383 100644 --- a/builders/milou/kde-v3-23/portage/make.conf +++ b/builders/milou/kde-v3-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/openrc-23/portage/make.conf b/builders/milou/openrc-23/portage/make.conf index 08eeeba..12932a6 100644 --- a/builders/milou/openrc-23/portage/make.conf +++ b/builders/milou/openrc-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/openrc-v3-23/portage/make.conf b/builders/milou/openrc-v3-23/portage/make.conf index 9e5834e..4a53383 100644 --- a/builders/milou/openrc-v3-23/portage/make.conf +++ b/builders/milou/openrc-v3-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/server-23/portage/make.conf b/builders/milou/server-23/portage/make.conf index 08eeeba..12932a6 100644 --- a/builders/milou/server-23/portage/make.conf +++ b/builders/milou/server-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles" diff --git a/builders/milou/server-v3-23/portage/make.conf b/builders/milou/server-v3-23/portage/make.conf index 9e5834e..4a53383 100644 --- a/builders/milou/server-v3-23/portage/make.conf +++ b/builders/milou/server-v3-23/portage/make.conf @@ -24,7 +24,7 @@ LC_MESSAGES=C MAKEOPTS="-j32 -l64" -EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" +EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going --binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner" FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox notitles"
