commit: dfda5d7a4371ec0a092cd8c37ccf0035318bc503 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Oct 8 21:09:36 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Oct 8 21:13:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfda5d7a
mail-client/thunderbird: 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> mail-client/thunderbird/thunderbird-60.9.0.ebuild | 8 +++++++- mail-client/thunderbird/thunderbird-68.1.1.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-60.9.0.ebuild b/mail-client/thunderbird/thunderbird-60.9.0.ebuild index 8c928066e9c..b0f5a33a9ef 100644 --- a/mail-client/thunderbird/thunderbird-60.9.0.ebuild +++ b/mail-client/thunderbird/thunderbird-60.9.0.ebuild @@ -34,7 +34,7 @@ MOZ_P="${PN}-${MOZ_PV}" LLVM_MAX_SLOT=8 -inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2 +inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2 multiprocessing DESCRIPTION="Thunderbird Mail Client" HOMEPAGE="https://www.mozilla.org/thunderbird"; @@ -277,6 +277,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 + # Autotools configure is now called old-configure.in # This works because there is still a configure.in that happens to be for the # shell wrapper configure script diff --git a/mail-client/thunderbird/thunderbird-68.1.1.ebuild b/mail-client/thunderbird/thunderbird-68.1.1.ebuild index 0610d908962..c9c1852c2d3 100644 --- a/mail-client/thunderbird/thunderbird-68.1.1.ebuild +++ b/mail-client/thunderbird/thunderbird-68.1.1.ebuild @@ -56,7 +56,7 @@ SRC_URI="${SRC_URI} 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 CDEPEND=" >=dev-libs/nss-3.44.1 @@ -263,6 +263,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" \
