Skip to content

Commit

Permalink
meson: fix perl dependencies
Browse files Browse the repository at this point in the history
`generate_perl_command` needs `depends: [git_version_file]` and the uses
in top-level meson.build were fine, but the ones in perl/ weren't, causing
parallel build failures in some cases as GIT-BUILD-OPTIONS wasn't yet
available.

Signed-off-by: Sam James <[email protected]>
Acked-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
thesamesam authored and gitster committed Jan 8, 2025
1 parent 904339e commit 45c0897
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions perl/FromCPAN/Mail/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ test_dependencies += custom_target(
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail',
depends: [git_version_file],
)
1 change: 1 addition & 0 deletions perl/FromCPAN/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ test_dependencies += custom_target(
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/FromCPAN',
depends: [git_version_file],
)

subdir('Mail')
1 change: 1 addition & 0 deletions perl/Git/LoadCPAN/Mail/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ test_dependencies += custom_target(
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN/Mail',
depends: [git_version_file],
)
1 change: 1 addition & 0 deletions perl/Git/LoadCPAN/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ test_dependencies += custom_target(
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN',
depends: [git_version_file],
)

subdir('Mail')
1 change: 1 addition & 0 deletions perl/Git/SVN/Memoize/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ test_dependencies += custom_target(
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/Git/SVN',
depends: [git_version_file],
)
1 change: 1 addition & 0 deletions perl/Git/SVN/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ foreach source : [
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/Git/SVN',
depends: [git_version_file],
)
endforeach

Expand Down
1 change: 1 addition & 0 deletions perl/Git/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ foreach source : [
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5/Git',
depends: [git_version_file],
)
endforeach

Expand Down
1 change: 1 addition & 0 deletions perl/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ test_dependencies += custom_target(
command: generate_perl_command,
install: true,
install_dir: get_option('datadir') / 'perl5',
depends: [git_version_file],
)

subdir('Git')
Expand Down

0 comments on commit 45c0897

Please sign in to comment.