From 8f7399abc5a6b4c61ad90853981c5e0d8c376a4f3ead6b35685b342e2c43a2ef Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 17 Jan 2022 10:58:42 +0000 Subject: [PATCH 1/2] - using memory-constraints on ppc64 for trying to avoid OOM during build (boo#1194739) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1079 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 6 ++++++ Mesa.changes | 6 ++++++ Mesa.spec | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 2b56735..a16d362 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 17 10:54:32 UTC 2022 - Stefan Dirsch + +- using memory-constraints on ppc64 for trying to avoid OOM during + build (boo#1194739) + ------------------------------------------------------------------- Fri Jan 14 15:02:55 UTC 2022 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index d31b849..045091c 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -143,6 +143,7 @@ BuildRequires: gcc-c++ BuildRequires: glslang-devel BuildRequires: imake BuildRequires: libtool +BuildRequires: memory-constraints BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-base @@ -789,6 +790,11 @@ sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build %endif %build +# try to avoid OOM on ppc64 (boo#1194739) +%ifarch ppc64 ppc64le +%limit_build -m 12000 +%endif + egl_platforms=x11,wayland %meson \ diff --git a/Mesa.changes b/Mesa.changes index 2b56735..a16d362 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 17 10:54:32 UTC 2022 - Stefan Dirsch + +- using memory-constraints on ppc64 for trying to avoid OOM during + build (boo#1194739) + ------------------------------------------------------------------- Fri Jan 14 15:02:55 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index bc8c5d9..93108df 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -142,6 +142,7 @@ BuildRequires: gcc-c++ BuildRequires: glslang-devel BuildRequires: imake BuildRequires: libtool +BuildRequires: memory-constraints BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-base @@ -788,6 +789,11 @@ sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build %endif %build +# try to avoid OOM on ppc64 (boo#1194739) +%ifarch ppc64 ppc64le +%limit_build -m 12000 +%endif + egl_platforms=x11,wayland %meson \ From 06d116fb6c16867da27d2e0ce439d3e986dcfb26575b41eb599c78702cddbfdc Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 17 Jan 2022 11:41:19 +0000 Subject: [PATCH 2/2] changed needed mem/pthread from 12GB to 750 MB OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1080 --- Mesa-drivers.spec | 2 +- Mesa.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 045091c..1f8d9ae 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -792,7 +792,7 @@ sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build %build # try to avoid OOM on ppc64 (boo#1194739) %ifarch ppc64 ppc64le -%limit_build -m 12000 +%limit_build -m 750 %endif egl_platforms=x11,wayland diff --git a/Mesa.spec b/Mesa.spec index 93108df..7a391a9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -791,7 +791,7 @@ sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build %build # try to avoid OOM on ppc64 (boo#1194739) %ifarch ppc64 ppc64le -%limit_build -m 12000 +%limit_build -m 750 %endif egl_platforms=x11,wayland