Re: [PATCH v3] meson: Pass -j option to sphinx

[Thomas Huth]

On 28/04/2023 19.45, Fabiano Rosas wrote:
> Markus Armbruster <armbru@redhat.com> writes:
>
> > Fabiano Rosas <farosas@suse.de> writes:
> >
> > > Save a bit of build time by passing the number of jobs option to
> > > sphinx.
> > >
> > > We cannot use the -j option from make because meson does not support
> > > setting build time parameters for custom targets. Use nproc instead or
> > > the equivalent sphinx option "-j auto", if that is available.
> > >
> > > Also make sure our plugins support parallelism and report it properly
> > > to sphinx. Particularly, implement the merge_domaindata method in
> > > DBusDomain that is used to merge in data from other subprocesses.
...
> > > diff --git a/docs/meson.build b/docs/meson.build
> > > index f220800e3e..138ec6ce6f 100644
> > > --- a/docs/meson.build
> > > +++ b/docs/meson.build
> > > @@ -10,6 +10,18 @@ if sphinx_build.found()
> > >       SPHINX_ARGS += [ '-W', '-Dkerneldoc_werror=1' ]
> > >     endif
> > >   
> > > +  sphinx_version = run_command(SPHINX_ARGS + ['--version'],
> > > +                               check: true).stdout().split()[1]
> > > +  if sphinx_version.version_compare('>=5.1.2')
> >
> > Where do you get 5.1.2 from?  I have 5.0.2, and -j auto appears to work
> > fine.  The manual page says "Changed in version 1.7: Support auto
> > argument."
>
> Ouch, I was looking at the readthedocs repository which has a similar
> change.
>
> So I think we could probably just hardcode the option. Most distros will
> have a more recent sphinx version.
> https://repology.org/project/python:sphinx/versions
>
> Let me try to figure out what gitlab is using. I know it is less than 4
> because our docs don't show some of the dbus parts

That's the "pages" job in .gitlab-ci.d/buildtest.yml, i.e. the debian-amd64 
container, i.e. Debian 11.

If I get that right (https://packages.debian.org/source/sphinx), this means 
we're using Sphinx v3.4.3 here.

 Thomas