commit:     7145ef907d11a39d6cd06a239d06040ddbdeb2ea
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 21:16:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 21:16:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7145ef90

www-client/firefox: force at least MAKEOPTS=-j2

Bug: https://bugs.gentoo.org/687028
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/firefox-70.0_beta12.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/www-client/firefox/firefox-70.0_beta12.ebuild 
b/www-client/firefox/firefox-70.0_beta12.ebuild
index c0ea91c..21f82e4 100644
--- a/www-client/firefox/firefox-70.0_beta12.ebuild
+++ b/www-client/firefox/firefox-70.0_beta12.ebuild
@@ -42,7 +42,7 @@ LLVM_MAX_SLOT=9
 
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
                gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-               autotools mozlinguas-v2 virtualx
+               autotools mozlinguas-v2 virtualx multiprocessing
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox";
@@ -270,6 +270,12 @@ src_prepare() {
        # Allow user to apply any additional patches without modifing ebuild
        eapply_user
 
+       local n_jobs=$(makeopts_jobs)
+       if [[ ${n_jobs} == 1 ]]; then
+               einfo "Building with MAKEOPTS=-j1 is known to fail (bug 
#687028); Forcing MAKEOPTS=-j2 ..."
+               export MAKEOPTS=-j2
+       fi
+
        # Enable gnomebreakpad
        if use debug ; then
                sed -i -e 
"s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \

Reply via email to