| Message ID | 20250124163049.23965-3-git@mavit.org.uk (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fix Meson Perl version check | expand |
On Fri, Jan 24, 2025 at 04:30:49PM +0000, Peter Oliver wrote: > 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') I'm still a bit sceptical whether we should adapt this second line to match against `>=26`. I guess as long as it doesn't break anything out there it's okayish, and if we do see breakage we can in the worst case revert it. In any case, it deserves a comment why we're matching against the minor version and not the whole version. E.g. something like this: # Executing `perl --version` results in a string similar to the # following output: # # This is perl 5, version 40, subversion 0 (v5.40.0) built for x86_64-linux-thread-multi # # Meson picks up the "40" as version number instead of using "v5.40.0" # due to the regular expression it uses. This got fixed in Meson 1.7.0, # but meanwhile we have to either use `-V:version` instead of `--version`, # which we can do starting with Meson 1.5.0 and newer, or we have to # match against the minor version. Thanks! Patrick
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', '')
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(-)