Re-enable debuginfo for ppc64le and s390x builds

- Require 8 GB of RAM per vCPU for debuginfo processing

This should reduce the debuginfo processing parallelization enough so
that low memory builders don't OOM during the debuginfo processing.

This reverts commit 0ece072912.
This commit is contained in:
Kalev Lember 2022-08-10 23:12:52 +02:00
parent 0ece072912
commit 8ea0b4518b

View File

@ -300,13 +300,14 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
# Remove debuginfo from 32-bit builds to reduce memory consumption: # Remove debuginfo from 32-bit builds to reduce memory consumption:
# https://bugs.webkit.org/show_bug.cgi?id=140176 # https://bugs.webkit.org/show_bug.cgi?id=140176
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/ # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
# Additionally, disable debuginfo for ppc64le and s390x builds as well as we %ifarch %{ix86}
# have trouble with the koji builders, https://pagure.io/releng/issue/10909
%ifarch %{ix86} ppc64le s390x
%global debug_package %{nil} %global debug_package %{nil}
%global optflags %(echo %{optflags} | sed 's/-g /-g0 /') %global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
%endif %endif
# Require 8 GB of RAM per vCPU for debuginfo processing
%global _find_debuginfo_opts %limit_build -m 8192
# Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to # Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to
# support 64 KB page sizes until the *builders* use RHEL 9. This means we still # support 64 KB page sizes until the *builders* use RHEL 9. This means we still
# have to disable JIT and bmalloc, even though this disables important heap # have to disable JIT and bmalloc, even though this disables important heap