From 45d96a5ad6a9ae36de5db7f319b166320271db1ed5c1ec9d1abc5fee3ba33b81 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 16 Sep 2020 16:09:59 +0000 Subject: [PATCH] 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 --- _constraints | 11 +++++++++++ qgis.changes | 6 ++++++ qgis.spec | 2 ++ 3 files changed, 19 insertions(+) diff --git a/_constraints b/_constraints index 3f1bd93..270af33 100644 --- a/_constraints +++ b/_constraints @@ -11,4 +11,15 @@ 1300 + + + ppc64 + ppc64le + + + + 0 + + + diff --git a/qgis.changes b/qgis.changes index 9f34b3e..b50c8e3 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 16 15:37:24 UTC 2020 - Michel Normand + +- 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 diff --git a/qgis.spec b/qgis.spec index 632cce2..f4d14e5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -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