summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-10-08 23:18:41 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-10-08 23:18:41 +0200
commit5fc50e6dfbce4a970ae1cfc0cf4275ee93565d5b (patch)
tree90542ba14e97696f3220f236808320b350b374bc /mail-client
parentwww-client/firefox: force at least MAKEOPTS=-j2 (diff)
downloadmozilla-5fc50e6dfbce4a970ae1cfc0cf4275ee93565d5b.tar.gz
mozilla-5fc50e6dfbce4a970ae1cfc0cf4275ee93565d5b.tar.bz2
mozilla-5fc50e6dfbce4a970ae1cfc0cf4275ee93565d5b.zip
mail-client/thunderbird: synchronize with Gentoo repository
Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/thunderbird/thunderbird-68.1.1.ebuild12
1 files changed, 7 insertions, 5 deletions
diff --git a/mail-client/thunderbird/thunderbird-68.1.1.ebuild b/mail-client/thunderbird/thunderbird-68.1.1.ebuild
index 5ba8241..c9c1852 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
@@ -158,7 +158,6 @@ DEPEND="${CDEPEND}
)
)
pulseaudio? ( media-sound/pulseaudio )
- >=virtual/cargo-1.34.0
>=virtual/rust-1.34.0
wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
@@ -264,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" \
@@ -553,9 +558,6 @@ src_configure() {
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- # disable webrtc for now, bug 667642
- use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
-
# allow elfhack to work in combination with unstripped binaries
# when they would normally be larger than 2GiB.
append-ldflags "-Wl,--compress-debug-sections=zlib"