MAKEOPTS was only respected for src_compile, leading to out-of-memory
issues for some users. Force number of concurrent jobs to 1 in src_configure
and src_install phases as it doesn't provide much of a benefit anyway.

Closes: https://bugs.gentoo.org/715542
Signed-off-by: Matthew Smith <matt...@gentoo.org>
---
 eclass/waf-utils.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 2a386e99165..66041fc3f60 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -99,6 +99,7 @@ waf-utils_src_configure() {
                LINKFLAGS="${CFLAGS} ${LDFLAGS}"
                PKGCONFIG="$(tc-getPKG_CONFIG)"
                "${WAF_BINARY}"
+               "--jobs=1"
                "--prefix=${EPREFIX}/usr"
                "${conf_args[@]}"
                "${@}"
@@ -129,8 +130,8 @@ waf-utils_src_compile() {
 waf-utils_src_install() {
        debug-print-function ${FUNCNAME} "$@"
 
-       echo "\"${WAF_BINARY}\" --destdir=\"${D}\" ${*} install"
-       "${WAF_BINARY}" --destdir="${D}" "${@}" install  || die "Make install 
failed"
+       echo "\"${WAF_BINARY}\" --jobs=1 --destdir=\"${D}\" ${*} install"
+       "${WAF_BINARY}" --jobs=1 --destdir="${D}" "${@}" install || die "Make 
install failed"
 
        # Manual document installation
        einstalldocs
-- 
2.38.1


Reply via email to