pool/MozillaFirefox
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 835187 from home:Guillaume_G:branches:openSUSE:Factory:ARM

Browse Source 
- 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
This commit is contained in:
Wolfgang Rosenauer 2020-09-17 12:12:41 +00:00 committed by Git OBS Bridge
parent 9689fbd025
commit 49c4b18dfc
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MozillaFirefox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 17 11:45:31 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- 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 <wr@rosenauer.org> Sat Aug 22 06:52:01 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org>

4
MozillaFirefox.spec
View File

@ -82,6 +82,7 @@ BuildRequires: autoconf213
BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-glib-devel
BuildRequires: dejavu-fonts BuildRequires: dejavu-fonts
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: memory-constraints
%if 0%{?suse_version} <= 1320 %if 0%{?suse_version} <= 1320
BuildRequires: gcc9-c++ BuildRequires: gcc9-c++
%else %else
@ -431,6 +432,9 @@ echo "export MOZ_TELEMETRY_REPORTING=1"
echo "" echo ""
cat << EOF cat << EOF
%else %else
%ifarch aarch64 %arm
%limit_build -m 2000
%endif
cat << EOF > $MOZCONFIG cat << EOF > $MOZCONFIG
%endif %endif
mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1

15
_constraints
View File

@ -17,12 +17,15 @@
<arch>armv7l</arch> <arch>armv7l</arch>
</conditions> </conditions>
<hardware> <hardware>
<memoryperjob>
<size unit="M">1000</size>
</memoryperjob>
<disk> <disk>
<size unit="G">12</size> <size unit="G">12</size>
</disk> </disk>
<memory> <physicalmemory>
<size unit="G">5</size> <size unit="G">5</size>
</memory> </physicalmemory>
</hardware> </hardware>
</overwrite> </overwrite>
<overwrite> <overwrite>
@ -30,9 +33,13 @@
<arch>aarch64</arch> <arch>aarch64</arch>
</conditions> </conditions>
<hardware> <hardware>
<memory> <processors>4</processors>
<memoryperjob>
<size unit="M">1000</size>
</memoryperjob>
<physicalmemory>
<size unit="G">12</size> <size unit="G">12</size>
</memory> </physicalmemory>
</hardware> </hardware>
</overwrite> </overwrite>
<overwrite> <overwrite>