[PATCH v2 2/2] meson: fix Perl version check for Meson versions before 1.7.0
- From
- Peter Oliver <p.d.oliver@mavit.org.uk>
- Date
- Jan 24, 2025, 16:30 UTC
- Message-ID
- <20250124163049.23965-3-git@mavit.org.uk>
- In-Reply-To
- <20250124163049.23965-1-git@mavit.org.uk>
Command `perl --version` says, e.g., “This is perl 5, version 26, subversion 0 (v5.26.0)”, which older versions of Meson interpret as version 26.
This will be fixed in Meson 1.7.0, but at the time of writing that isn’t yet released.
If we run `perl -V:version` we get the unambiguous response “version='5.26.0';”, but we need at least Meson 1.5.0 to be able to do that.
Signed-off-by: Peter Oliver <git@mavit.org.uk> --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build index f01d81b39f..80af578d36 100644 --- a/meson.build +++ b/meson.build @@ -755,7 +755,11 @@ endif # Note that we only set NO_PERL if the Perl features were disabled by the user. # It may not be set when we have found Perl, but only use it to run tests. -perl = find_program('perl', version: '>=5.26.0', dirs: program_path, required: perl_required) +if meson.version().version_compare('>=1.5.0') + perl = find_program('perl', dirs: program_path, required: perl_required, version: '>=5.26.0', version_argument: '-V:version') +else + perl = find_program('perl', dirs: program_path, required: perl_required, version: '>=26') +endif perl_features_enabled = perl.found() and get_option('perl').allowed() if perl_features_enabled build_options_config.set('NO_PERL', '')
-- 2.48.1