From: Jan Palus <atler@pld-linux.org>
Date: Sun, 5 Jul 2020 10:53:28 +0000 (+0200)
Subject: sync parallel jobs limit logic with firefox
X-Git-Tag: auto/th/thunderbird-78.0-1~1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=4d8e1d33adaf7db6a3eb1eed5114febaabfe424a;p=packages%2Fthunderbird.git

sync parallel jobs limit logic with firefox
---

diff --git a/thunderbird.spec b/thunderbird.spec
index aac3796..f6bc0c4 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1366,12 +1366,14 @@ EOF
 %if ! %{with clang}
 # On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
-RPM_BUILD_NR_THREADS=1
+MOZ_PARALLEL_BUILD=1
 %ifarch %{x8664}
-jobs=$(echo %{_smp_mflags} | cut -dj -f2)
-[ -n "$jobs" -a "$jobs" -gt 4 ] && RPM_BUILD_NR_THREADS=4 || RPM_BUILD_NR_THREADS="$jobs"
+jobs="%{__jobs}"
+[ -n "$jobs" -a "$jobs" -gt 4 ] && MOZ_PARALLEL_BUILD=4 || MOZ_PARALLEL_BUILD="$jobs"
 %endif
-export MOZ_MAKE_FLAGS="-j${RPM_BUILD_NR_THREADS}"
+export MOZ_PARALLEL_BUILD
+%else
+%{?__jobs:export MOZ_PARALLEL_BUILD="%__jobs"}
 %endif
 
 AUTOCONF=/usr/bin/autoconf2_13 ./mach build