Skip to content

Commit 45c0897

Browse files
thesamesamgitster
authored andcommitted
meson: fix perl dependencies
`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]>
1 parent 904339e commit 45c0897

File tree

8 files changed

+8
-0
lines changed

8 files changed

+8
-0
lines changed

perl/FromCPAN/Mail/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ test_dependencies += custom_target(
44
command: generate_perl_command,
55
install: true,
66
install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail',
7+
depends: [git_version_file],
78
)

perl/FromCPAN/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ test_dependencies += custom_target(
44
command: generate_perl_command,
55
install: true,
66
install_dir: get_option('datadir') / 'perl5/FromCPAN',
7+
depends: [git_version_file],
78
)
89

910
subdir('Mail')

perl/Git/LoadCPAN/Mail/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ test_dependencies += custom_target(
44
command: generate_perl_command,
55
install: true,
66
install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN/Mail',
7+
depends: [git_version_file],
78
)

perl/Git/LoadCPAN/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ test_dependencies += custom_target(
44
command: generate_perl_command,
55
install: true,
66
install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN',
7+
depends: [git_version_file],
78
)
89

910
subdir('Mail')

perl/Git/SVN/Memoize/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ test_dependencies += custom_target(
44
command: generate_perl_command,
55
install: true,
66
install_dir: get_option('datadir') / 'perl5/Git/SVN',
7+
depends: [git_version_file],
78
)

perl/Git/SVN/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ foreach source : [
1414
command: generate_perl_command,
1515
install: true,
1616
install_dir: get_option('datadir') / 'perl5/Git/SVN',
17+
depends: [git_version_file],
1718
)
1819
endforeach
1920

perl/Git/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ foreach source : [
1111
command: generate_perl_command,
1212
install: true,
1313
install_dir: get_option('datadir') / 'perl5/Git',
14+
depends: [git_version_file],
1415
)
1516
endforeach
1617

perl/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ test_dependencies += custom_target(
44
command: generate_perl_command,
55
install: true,
66
install_dir: get_option('datadir') / 'perl5',
7+
depends: [git_version_file],
78
)
89

910
subdir('Git')

0 commit comments

Comments
 (0)