From 49c4b18dfc422c73b49afb4f6e6c50e48182e183f359edbe5ca4b1ec7fa83356 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 17 Sep 2020 12:12:41 +0000 Subject: [PATCH] Accepting request 835187 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Use %limit_build macro again for aarch64 and armv7, instead of the new memoryperjob _constraints to use more workers OBS-URL: https://build.opensuse.org/request/show/835187 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=857 --- MozillaFirefox.changes | 6 ++++++ MozillaFirefox.spec | 4 ++++ _constraints | 15 +++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 7dccc75..d0b800b 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 17 11:45:31 UTC 2020 - Guillaume GARDET + +- Use %limit_build macro again for aarch64 and armv7, instead of + the new memoryperjob _constraints to use more workers + ------------------------------------------------------------------- Sat Aug 22 06:52:01 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 1d301c3..72c121f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -82,6 +82,7 @@ BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel BuildRequires: dejavu-fonts BuildRequires: fdupes +BuildRequires: memory-constraints %if 0%{?suse_version} <= 1320 BuildRequires: gcc9-c++ %else @@ -431,6 +432,9 @@ echo "export MOZ_TELEMETRY_REPORTING=1" echo "" cat << EOF %else +%ifarch aarch64 %arm +%limit_build -m 2000 +%endif cat << EOF > $MOZCONFIG %endif mk_add_options MOZILLA_OFFICIAL=1 diff --git a/_constraints b/_constraints index 8c6fedd..b0130e5 100644 --- a/_constraints +++ b/_constraints @@ -17,12 +17,15 @@ armv7l + + 1000 + 12 - + 5 - + @@ -30,9 +33,13 @@ aarch64 - + 4 + + 1000 + + 12 - +