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 <sam@gentoo.org>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/perl/FromCPAN/Mail/meson.build b/perl/FromCPAN/Mail/meson.build
index 129cff161c585645c111af0386bafe136258e3db..b4ff2fc0b24c95490bee5fd57f6aa65e1dba3539 100644 (file)
--- a/perl/FromCPAN/Mail/meson.build
+++ b/perl/FromCPAN/Mail/meson.build
@@ -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],
 )

diff --git a/perl/FromCPAN/meson.build b/perl/FromCPAN/meson.build
index 4e7ea909df3593fb65facb4bf6a1c42e954d6f70..1f9ea6ce8e8442f656d2fd632ad6c76f5eb797df 100644 (file)
--- a/perl/FromCPAN/meson.build
+++ b/perl/FromCPAN/meson.build
@@ -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')

diff --git a/perl/Git/LoadCPAN/Mail/meson.build b/perl/Git/LoadCPAN/Mail/meson.build
index 7da5b37adb278b4e13f41ea5ebc762bb4d78b64b..89cde56be84912e01fde974bfc499b1faa6b3bc7 100644 (file)
--- a/perl/Git/LoadCPAN/Mail/meson.build
+++ b/perl/Git/LoadCPAN/Mail/meson.build
@@ -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],
 )

diff --git a/perl/Git/LoadCPAN/meson.build b/perl/Git/LoadCPAN/meson.build
index 9468c073aeb5ae1980f88b4c7f2c7fe69355ea37..1ee915c650517d91521d2e2f982ce8fa07ca385e 100644 (file)
--- a/perl/Git/LoadCPAN/meson.build
+++ b/perl/Git/LoadCPAN/meson.build
@@ -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')

diff --git a/perl/Git/SVN/Memoize/meson.build b/perl/Git/SVN/Memoize/meson.build
index 515ab3dd926618f6c46b030e1f283d637fdddedf..233ec670d7de9182ab1e32ac5f33a60aa5aa0e9a 100644 (file)
--- a/perl/Git/SVN/Memoize/meson.build
+++ b/perl/Git/SVN/Memoize/meson.build
@@ -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],
 )

diff --git a/perl/Git/SVN/meson.build b/perl/Git/SVN/meson.build
index 8338531041d8e5cd4e8c2c8a0c3dcfc8b2d23cc9..44abaf42b7cea36fe937ddc70cebcf9bcf06734d 100644 (file)
--- a/perl/Git/SVN/meson.build
+++ b/perl/Git/SVN/meson.build
@@ -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
 

diff --git a/perl/Git/meson.build b/perl/Git/meson.build
index 259209d7302809b6c1d3249d9d21548515c31c77..b21fa5591e7e7908bc2965baf37d378e6ce1aba3 100644 (file)
--- a/perl/Git/meson.build
+++ b/perl/Git/meson.build
@@ -11,6 +11,7 @@ foreach source : [
     command: generate_perl_command,
     install: true,
     install_dir: get_option('datadir') / 'perl5/Git',
+    depends: [git_version_file],
   )
 endforeach
 

diff --git a/perl/meson.build b/perl/meson.build
index c22d6f8a1a3266ded27c43c43c88620f9b4badcf..2d4ab1c4a986f71d44f77275b8126d1d671e538e 100644 (file)
--- a/perl/meson.build
+++ b/perl/meson.build
@@ -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')