[PATCH] find-debuginfo: Pass -j down to dwz

[Kalev Lember]

On Thu, Jan 26, 2023 at 3:34 PM Mark Wielaard <mark@klomp.org> wrote:

> Hi Kalev,
>

Hi Mark,


> Aha, you want to reduce the default parallelism (processors / 2)?
>

Yes, exactly!

We have the following in webkitgtk, which basically just passes -j1 on low
memory builders:

# Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not
enough.
%global _find_debuginfo_opts %limit_build -m 32768


> diff --git a/scripts/find-debuginfo.in b/scripts/find-debuginfo.in
> > index b07a52f..8cc1bfd 100755
> > --- a/scripts/find-debuginfo.in
> > +++ b/scripts/find-debuginfo.in
> > @@ -585,7 +585,7 @@ if $run_dwz \
> >        dwz_multifile_suffix=".${dwz_multifile_idx}"
> >      done
> >      dwz_multifile_name="${dwz_multifile_name}${dwz_multifile_suffix}"
> > -    dwz_opts="-h -q -r"
> > +    dwz_opts="-h -q -r -j ${n_jobs}"
> >      [ ${#dwz_files[@]} -gt 1 ] && [ "$dwz_single_file_mode" = "false" ]
> \
> >        && dwz_opts="${dwz_opts} -m .dwz/${dwz_multifile_name}"
> >      mkdir -p "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz"
>
> I agree with Panu that a configure check would be nice to make sure the
> installed dwz does support -j. Would the attached patch work for you?
>

That looks perfect to me. Thanks a lot!

Can you also apply it to the rawhide package, please? That way I can
confirm if it actually works on actual koji builders and see if we can get
webkitgtk building right.

Thanks,
Kalev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://sourceware.org/pipermail/debugedit/attachments/20230126/ae39c081/attachment.htm>