Merge branch 'dd/meson-perl-custom-path' into seen

gitster · gitster · commit 09fe180f6fa0 · 2025-04-30T16:29:22.000-07:00
Meson-based build framework update.

Looking good.  Expecting a minor reroll.
cf. &lt;aA8vSPKdznjzBf6W@pks.im&gt;

* dd/meson-perl-custom-path:
  meson: allow customize perl installation path
diff --git a/meson.build b/meson.build
@@ -1905,14 +1905,19 @@ if perl_features_enabled
     perl_header_template = 'perl/header_templates/runtime_prefix.template.pl'
   endif
 
+  perllibdir = get_option('perllibdir')
+  if perllibdir == ''
+    perllibdir = get_option('datadir') / 'perl5'
+  endif
+
   perl_header = configure_file(
     input: perl_header_template,
     output: 'GIT-PERL-HEADER',
     configuration: {
       'GITEXECDIR_REL': get_option('libexecdir') / 'git-core',
-      'PERLLIBDIR_REL': get_option('datadir') / 'perl5',
+      'PERLLIBDIR_REL': perllibdir,
       'LOCALEDIR_REL': get_option('datadir') / 'locale',
-      'INSTLIBDIR': get_option('datadir') / 'perl5',
+      'INSTLIBDIR': perllibdir,
       'PATHSEP': pathsep,
     },
   )
diff --git a/meson_options.txt b/meson_options.txt
@@ -1,3 +1,8 @@
+# Configuration for Git installation
+
+option('perllibdir', type: 'string', value: '',
+  description: 'Directory to install perl lib to. Default to <datadir>/perl5')
+
 # Configuration for how Git behaves at runtime.
 option('default_pager', type: 'string', value: 'less',
   description: 'Fall-back pager.')
diff --git a/perl/FromCPAN/Mail/meson.build b/perl/FromCPAN/Mail/meson.build
@@ -3,6 +3,6 @@ test_dependencies += custom_target(
   output: 'Address.pm',
   command: generate_perl_command,
   install: true,
-  install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail',
+  install_dir: perllibdir / 'FromCPAN/Mail',
   depends: [git_version_file],
 )
diff --git a/perl/FromCPAN/meson.build b/perl/FromCPAN/meson.build
@@ -3,7 +3,7 @@ test_dependencies += custom_target(
   output: 'Error.pm',
   command: generate_perl_command,
   install: true,
-  install_dir: get_option('datadir') / 'perl5/FromCPAN',
+  install_dir: perllibdir / 'FromCPAN',
   depends: [git_version_file],
 )
 
diff --git a/perl/Git/LoadCPAN/Mail/meson.build b/perl/Git/LoadCPAN/Mail/meson.build
@@ -3,6 +3,6 @@ test_dependencies += custom_target(
   output: 'Address.pm',
   command: generate_perl_command,
   install: true,
-  install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN/Mail',
+  install_dir: perllibdir / 'Git/LoadCPAN/Mail',
   depends: [git_version_file],
 )
diff --git a/perl/Git/LoadCPAN/meson.build b/perl/Git/LoadCPAN/meson.build
@@ -3,7 +3,7 @@ test_dependencies += custom_target(
   output: 'Error.pm',
   command: generate_perl_command,
   install: true,
-  install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN',
+  install_dir: perllibdir / 'Git/LoadCPAN',
   depends: [git_version_file],
 )
 
diff --git a/perl/Git/SVN/Memoize/meson.build b/perl/Git/SVN/Memoize/meson.build
@@ -3,6 +3,6 @@ test_dependencies += custom_target(
   output: 'YAML.pm',
   command: generate_perl_command,
   install: true,
-  install_dir: get_option('datadir') / 'perl5/Git/SVN',
+  install_dir: perllibdir / 'Git/SVN',
   depends: [git_version_file],
 )
diff --git a/perl/Git/SVN/meson.build b/perl/Git/SVN/meson.build
@@ -13,7 +13,7 @@ foreach source : [
     output: source,
     command: generate_perl_command,
     install: true,
-    install_dir: get_option('datadir') / 'perl5/Git/SVN',
+    install_dir: perllibdir / 'Git/SVN',
     depends: [git_version_file],
   )
 endforeach
diff --git a/perl/Git/meson.build b/perl/Git/meson.build
@@ -10,7 +10,7 @@ foreach source : [
     output: source,
     command: generate_perl_command,
     install: true,
-    install_dir: get_option('datadir') / 'perl5/Git',
+    install_dir: perllibdir / 'Git',
     depends: [git_version_file],
   )
 endforeach
diff --git a/perl/meson.build b/perl/meson.build
@@ -3,7 +3,7 @@ test_dependencies += custom_target(
   output: 'Git.pm',
   command: generate_perl_command,
   install: true,
-  install_dir: get_option('datadir') / 'perl5',
+  install_dir: perllibdir,
   depends: [git_version_file],
 )
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ test_dependencies += custom_target(`
`3`	`3`	`output: 'Address.pm',`
`4`	`4`	`command: generate_perl_command,`
`5`	`5`	`install: true,`
`6`		`- install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail',`
	`6`	`+ install_dir: perllibdir / 'FromCPAN/Mail',`
`7`	`7`	`depends: [git_version_file],`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ test_dependencies += custom_target(`
`3`	`3`	`output: 'Error.pm',`
`4`	`4`	`command: generate_perl_command,`
`5`	`5`	`install: true,`
`6`		`- install_dir: get_option('datadir') / 'perl5/FromCPAN',`
	`6`	`+ install_dir: perllibdir / 'FromCPAN',`
`7`	`7`	`depends: [git_version_file],`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ test_dependencies += custom_target(`
`3`	`3`	`output: 'YAML.pm',`
`4`	`4`	`command: generate_perl_command,`
`5`	`5`	`install: true,`
`6`		`- install_dir: get_option('datadir') / 'perl5/Git/SVN',`
	`6`	`+ install_dir: perllibdir / 'Git/SVN',`
`7`	`7`	`depends: [git_version_file],`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ foreach source : [`
`13`	`13`	`output: source,`
`14`	`14`	`command: generate_perl_command,`
`15`	`15`	`install: true,`
`16`		`- install_dir: get_option('datadir') / 'perl5/Git/SVN',`
	`16`	`+ install_dir: perllibdir / 'Git/SVN',`
`17`	`17`	`depends: [git_version_file],`
`18`	`18`	`)`
`19`	`19`	`endforeach`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ foreach source : [`
`10`	`10`	`output: source,`
`11`	`11`	`command: generate_perl_command,`
`12`	`12`	`install: true,`
`13`		`- install_dir: get_option('datadir') / 'perl5/Git',`
	`13`	`+ install_dir: perllibdir / 'Git',`
`14`	`14`	`depends: [git_version_file],`
`15`	`15`	`)`
`16`	`16`	`endforeach`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ test_dependencies += custom_target(`
`3`	`3`	`output: 'Git.pm',`
`4`	`4`	`command: generate_perl_command,`
`5`	`5`	`install: true,`
`6`		`- install_dir: get_option('datadir') / 'perl5',`
	`6`	`+ install_dir: perllibdir,`
`7`	`7`	`depends: [git_version_file],`
`8`	`8`	`)`
`9`	`9`