summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2020-11-13 19:22:57 +0100
committerMartin Stransky <stransky@redhat.com>2020-11-13 19:22:57 +0100
commitdf7299e442144584e9987d7dcf77ec83ad9afe86 (patch)
tree3f794dfd552aa60870003ff3689f28030a0a7cc1
parentUpdated build dependencies and cbindgen version (diff)
downloadlibrewolf-fedora-ff-df7299e442144584e9987d7dcf77ec83ad9afe86.tar.gz
librewolf-fedora-ff-df7299e442144584e9987d7dcf77ec83ad9afe86.tar.bz2
librewolf-fedora-ff-df7299e442144584e9987d7dcf77ec83ad9afe86.zip
Use mas 2 build process on aarch64/arm/s390x
-rw-r--r--firefox.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/firefox.spec b/firefox.spec
index c3df62b..625d2f6 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,7 +10,7 @@
# There are still build problems on s390x, see
# https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351
# https://bugzilla.redhat.com/show_bug.cgi?id=1897522
-ExcludeArch: s390x
+# ExcludeArch: s390x
%ifarch armv7hl
%global create_debuginfo 0
@@ -650,12 +650,12 @@ export CCACHE_DISABLE=1
MOZ_SMP_FLAGS=-j1
# 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.
-%ifarch %{ix86}
+%ifarch %{ix86} s390x %{arm} aarch64
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
%endif
-%ifarch x86_64 ppc ppc64 ppc64le %{arm} aarch64
+%ifarch x86_64 ppc ppc64 ppc64le
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
bgstack15