From 3c6d6f9fe7264ff1ebee8f9264d0e4e2b657050b Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 25 Jan 2011 11:15:09 -0800 Subject: [PATCH] Update the parallel build flags Up to -j4 is supported on x86 arches (upstream builds with -j4) Leave the other arches out still since they are not proven to be reliable. --- firefox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index 3352d5d..db23a55 100644 --- a/firefox.spec +++ b/firefox.spec @@ -153,10 +153,13 @@ export PREFIX='%{_prefix}' export LIBDIR='%{_libdir}' MOZ_SMP_FLAGS=-j1 -%ifnarch ppc ppc64 s390 s390x +# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel, +# however builds tend to fail on other arches when building in parallel. +%ifarch %{ix86} x86_64 [ -z "$RPM_BUILD_NCPUS" ] && \ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" -[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2 +[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 +[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 %endif INTERNAL_GECKO=%{internal_version}