threads / patch / 62787

patchmeson: fix perl dependencies for Documentation

Subject: [PATCH] meson: fix perl dependencies for Documentation

## tl;dr

3 messages between Jan 11, 2025 and Jan 14, 2025. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Sam James· Jan 11, 2025, 06:38 UTC · lore

We need an explicit `depends: documentation_deps` so that all of our Documentation targets know they require asciidoc.conf. This shows up as parallel build failures with it not yet being available.

Other targets look OK already.
Signed-off-by: Sam James <sam@gentoo.org>
---
 Documentation/technical/meson.build | 2 ++
 1 file changed, 2 insertions(+)
Show changes to Documentation/technical/meson.build +2 −0
diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
index 21dfb8b5c9..8c93da3566 100644
--- a/Documentation/technical/meson.build
+++ b/Documentation/technical/meson.build
@@ -42,6 +42,7 @@ api_index = custom_target(
     '@OUTPUT@',
   ],
   env: script_environment,
+  depends: documentation_deps,
   input: api_docs,
   output: 'api-index.txt',
 )
@@ -60,6 +61,7 @@ foreach article : api_docs + articles
     command: asciidoc_html_options,
     input: article,
     output: fs.stem(article) + '.html',
+    depends: documentation_deps,
     install: true,
     install_dir: get_option('datadir') / 'doc/git-doc/technical',
   )

-- 
2.48.0.rc2
Patrick Steinhardt· Jan 13, 2025, 08:26 UTC · re: Sam James · lore

Re: [PATCH] meson: fix perl dependencies for Documentation

On Sat, Jan 11, 2025 at 06:38:50AM +0000, Sam James wrote:
Show 12 quoted lines
> diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
> index 21dfb8b5c9..8c93da3566 100644
> --- a/Documentation/technical/meson.build
> +++ b/Documentation/technical/meson.build
> @@ -42,6 +42,7 @@ api_index = custom_target(
>      '@OUTPUT@',
>    ],
>    env: script_environment,
> +  depends: documentation_deps,
>    input: api_docs,
>    output: 'api-index.txt',
>  )

Wait, this doesn't make a lot of sense to me. "api-index.sh" does not care about "asciidoc.conf" at all, so why is this dependency needed?

Show 8 quoted lines
> @@ -60,6 +61,7 @@ foreach article : api_docs + articles
>      command: asciidoc_html_options,
>      input: article,
>      output: fs.stem(article) + '.html',
> +    depends: documentation_deps,
>      install: true,
>      install_dir: get_option('datadir') / 'doc/git-doc/technical',
>    )
This one looks as expected, though.
Thanks!
Patrick
Sam James· Jan 14, 2025, 14:03 UTC · re: Patrick Steinhardt · lore

Re: [PATCH] meson: fix perl dependencies for Documentation

Patrick Steinhardt <ps@pks.im> writes:
Show 16 quoted lines
> On Sat, Jan 11, 2025 at 06:38:50AM +0000, Sam James wrote:
>> diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
>> index 21dfb8b5c9..8c93da3566 100644
>> --- a/Documentation/technical/meson.build
>> +++ b/Documentation/technical/meson.build
>> @@ -42,6 +42,7 @@ api_index = custom_target(
>>      '@OUTPUT@',
>>    ],
>>    env: script_environment,
>> +  depends: documentation_deps,
>>    input: api_docs,
>>    output: 'api-index.txt',
>>  )
>
> Wait, this doesn't make a lot of sense to me. "api-index.sh" does not
> care about "asciidoc.conf" at all, so why is this dependency needed?

You're completely right -- I thought I'd found that api-index.sh *did* need it, but it definitely doesn't upon checking.

Show 13 quoted lines
>
>> @@ -60,6 +61,7 @@ foreach article : api_docs + articles
>>      command: asciidoc_html_options,
>>      input: article,
>>      output: fs.stem(article) + '.html',
>> +    depends: documentation_deps,
>>      install: true,
>>      install_dir: get_option('datadir') / 'doc/git-doc/technical',
>>    )
>
> This one looks as expected, though.
>
> Thanks!
I'll respin. Thanks.
>
> Patrick

← back to recent threads