pool/qgis
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 828081 from home:marxin:memory-constraint

Browse Source 
Use memoryperjob constraint instead of %limit_build macro.

OBS-URL: https://build.opensuse.org/request/show/828081
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=309
This commit is contained in:
Martin Pluskal 2020-08-20 12:38:13 +00:00 committed by Git OBS Bridge
parent 93076902df
commit 9417f279d0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_constraints
View File

@ -7,5 +7,8 @@
<memory> <memory>
<size unit="G">8</size> <size unit="G">8</size>
</memory> </memory>
<memoryperjob>
<size unit="M">1300</size>
</memoryperjob>
</hardware> </hardware>
</constraints> </constraints>

5
qgis.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 20 09:04:43 UTC 2020 - Martin Liška <mliska@suse.cz>
- Use memoryperjob constraint instead of %limit_build macro.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 7 16:58:27 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com> Tue Jul 7 16:58:27 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>

2
qgis.spec
View File

@ -140,7 +140,6 @@ Obsoletes: qgis2
BuildRequires: grass-devel >= 7.2 BuildRequires: grass-devel >= 7.2
%endif %endif
%ifarch ppc64le %ifarch ppc64le
BuildRequires: memory-constraints
%endif %endif
%package devel %package devel
@ -224,7 +223,6 @@ export QTDIR=%{_prefix}
export PATH=$PATH:$QTDIR/bin export PATH=$PATH:$QTDIR/bin
%ifarch ppc64le %ifarch ppc64le
# avoid OOM failure on power8-01 builder # avoid OOM failure on power8-01 builder
%limit_build -m 1300
%endif %endif
%make_jobs %make_jobs