SHA256
1
0
forked from pool/qgis

Accepting request 834944 from home:michel_mno:branches:Application:Geo

- for ppc64le put back limit_build to avoid OOM failure and
  unset memoryperjob that did not solve the OOM failure.

OBS-URL: https://build.opensuse.org/request/show/834944
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=311
This commit is contained in:
Dirk Stoecker 2020-09-16 16:09:59 +00:00 committed by Git OBS Bridge
parent c671fc16ed
commit 45d96a5ad6
3 changed files with 19 additions and 0 deletions

View File

@ -11,4 +11,15 @@
<size unit="M">1300</size>
</memoryperjob>
</hardware>
<overwrite>
<conditions>
<arch>ppc64</arch>
<arch>ppc64le</arch>
</conditions>
<hardware>
<memoryperjob>
<size unit="M">0</size>
</memoryperjob>
</hardware>
</overwrite>
</constraints>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 16 15:37:24 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
- for ppc64le put back limit_build to avoid OOM failure and
unset memoryperjob that did not solve the OOM failure.
-------------------------------------------------------------------
Tue Sep 15 12:12:24 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de>

View File

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