summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-10-08 23:09:36 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-10-08 23:13:57 +0200
commitdfda5d7a4371ec0a092cd8c37ccf0035318bc503 (patch)
tree811d3a3027ec258a2b942ab75b19ded11288f1ed /mail-client/thunderbird
parentwww-client/firefox: force at least MAKEOPTS=-j2 (diff)
downloadgentoo-dfda5d7a4371ec0a092cd8c37ccf0035318bc503.tar.gz
gentoo-dfda5d7a4371ec0a092cd8c37ccf0035318bc503.tar.bz2
gentoo-dfda5d7a4371ec0a092cd8c37ccf0035318bc503.zip
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@gentoo.org>
Diffstat (limited to 'mail-client/thunderbird')
-rw-r--r--mail-client/thunderbird/thunderbird-60.9.0.ebuild8
-rw-r--r--mail-client/thunderbird/thunderbird-68.1.1.ebuild8
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 8c928066e9c6..b0f5a33a9ef4 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 0610d908962f..c9c1852c2d38 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" \