Accepting request 1074875 from home:Guillaume_G:branches:devel:gcc

Add %limit_build for gcc13 to avoid OOM. We cannot use memoryperjob in _constraints file because it would reduce the number of worker to 13 on aarch64, which are all known to be slow. OBS-URL: https://build.opensuse.org/request/show/1074875 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=32
2023-03-28 12:14:15 +00:00 · 2023-03-28 12:14:15 +00:00 · a2657d9149
commit a2657d9149
parent 26b3f96cdc
34 changed files with 140 additions and 0 deletions
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@ -342,6 +342,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@ -342,6 +342,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@ -342,6 +342,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@ -342,6 +342,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@ -342,6 +342,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@ -341,6 +341,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/gcc.spec.in
+++ b/gcc.spec.in
@ -17,6 +17,8 @@

 # nospeccleaner

+%global flavor @BUILD_FLAVOR@%{nil}
+
 %if 0%{?suse_version} < 1550
 %define _slibdir  /%{_lib}
 %define slibdir   /lib
@ -127,6 +129,13 @@
 %define build_jit 0
 %endif

+# Limit the number of parallel jobs to avoid OOM for gcc13
+%if "%{flavor}" == ""
+%bcond_without limitbuild
+%else
+%bcond_with limitbuild
+%endif
+
 # Shared library SONAME versions
 %ifarch hppa
 %define libgcc_s 4
@ -229,6 +238,9 @@ BuildRequires: texinfo
 # until here, but at least renaming and patching info files breaks this
 BuildRequires: gcc-c++
 BuildRequires: glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires: mpc-devel
 BuildRequires: mpfr-devel
 BuildRequires: perl
@ -1353,6 +1365,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@ -37,6 +37,8 @@

 # nospeccleaner

+%global flavor @BUILD_FLAVOR@%{nil}
+
 %if 0%{?suse_version} < 1550
 %define _slibdir  /%{_lib}
 %define slibdir   /lib
@ -147,6 +149,13 @@
 %define build_jit 0
 %endif

+# Limit the number of parallel jobs to avoid OOM for gcc13
+%if "%{flavor}" == ""
+%bcond_without limitbuild
+%else
+%bcond_with limitbuild
+%endif
+
 # Shared library SONAME versions
 %ifarch hppa
 %define libgcc_s 4
@ -245,6 +254,9 @@ BuildRequires:  texinfo
 # until here, but at least renaming and patching info files breaks this
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
@ -544,6 +556,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
--- a/gcc13.changes
+++ b/gcc13.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 24 14:44:48 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add %limit_build for gcc13 to avoid OOM
+
 -------------------------------------------------------------------
 Fri Mar 24 13:37:38 UTC 2023 - Martin Liška <mliska@suse.cz>

--- a/gcc13.spec
+++ b/gcc13.spec
@ -16,6 +16,8 @@
 #


+%global flavor @BUILD_FLAVOR@%{nil}
+
 %if 0%{?suse_version} < 1550
 %define _slibdir  /%{_lib}
 %define slibdir   /lib
@ -126,6 +128,13 @@
 %define build_jit 0
 %endif

+# Limit the number of parallel jobs to avoid OOM for gcc13
+%if "%{flavor}" == ""
+%bcond_without limitbuild
+%else
+%bcond_with limitbuild
+%endif
+
 # Shared library SONAME versions
 %ifarch hppa
 %define libgcc_s 4
@ -224,6 +233,9 @@ BuildRequires:  texinfo
 # until here, but at least renaming and patching info files breaks this
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel-32bit
+%if %{with limitbuild}
+BuildRequires:  memory-constraints
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
@ -2361,6 +2373,9 @@ ln -s newlib-4.3.0.20230120/newlib .
 #test patching end

 %build
+%if %{with limitbuild}
+%limit_build -m 900
+%endif
 %define _lto_cflags %{nil}
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch