mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: fix dependencies for generated headers

Browse Source 
We generate a couple of headers from our documentation. These headers
are added to the libgit sources, but two of them aren't used by the
library, but instead by our builtins. This can cause parallel builds to
fail because the builtin object may be compiled before the header was
generated.

Fix the issue by adding both "config-list.h" and "hook-list.h" to the
list of builtin sources. While "command-list.h" is generated similarly,
it is used by "help.c" and thus part of the libgit sources indeed.

Reported-by: Evan Martin <evan.martin@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-01-22 13:05:47 +01:00
committed by Junio C Hamano
parent 6ff99174d1
commit 53d75bd3e4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@ -487,6 +487,13 @@ libgit_sources = [
'xdiff/xutils.c',
]
libgit_sources += custom_target(
input: 'command-list.txt',
output: 'command-list.h',
command: [shell, meson.current_source_dir() + '/generate-cmdlist.sh', meson.current_source_dir(), '@OUTPUT@'],
env: script_environment,
)
builtin_sources = [
'builtin/add.c',
'builtin/am.c',
@ -614,14 +621,7 @@ builtin_sources = [
'builtin/write-tree.c',
]
libgit_sources += custom_target(
input: 'command-list.txt',
output: 'command-list.h',
command: [shell, meson.current_source_dir() + '/generate-cmdlist.sh', meson.current_source_dir(), '@OUTPUT@'],
env: script_environment,
)
libgit_sources += custom_target(
builtin_sources += custom_target(
output: 'config-list.h',
command: [
shell,
@ -632,7 +632,7 @@ libgit_sources += custom_target(
env: script_environment,
)
libgit_sources += custom_target(
builtin_sources += custom_target(
input: 'Documentation/githooks.txt',
output: 'hook-list.h',
command: [