From 4d8e1d33adaf7db6a3eb1eed5114febaabfe424a Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 5 Jul 2020 12:53:28 +0200 Subject: [PATCH] sync parallel jobs limit logic with firefox --- thunderbird.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 -- 2.44.0