diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2025-03-20 18:55:29 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2025-03-20 18:55:29 -0400 |
| commit | 12604593e9f3b3460f7359a39d25731aff6beb88 (patch) | |
| tree | ca3954bcc55687365a11fbf5fad7ac5e74aefdd8 | |
| parent | fc51a60dd45bb39d21d09a890da2f21ac8e61532 (diff) | |
| download | postgresql-12604593e9f3b3460f7359a39d25731aff6beb88.tar.gz postgresql-12604593e9f3b3460f7359a39d25731aff6beb88.zip | |
Show plperl version in the meson setup summary.
Also, use perl 'version' instead of 'api_versionstring' to sync with
the configure script.
Author: Roman Zharkov <r.zharkov@postgrespro.ru>
Discussion: https://postgr.es/m/93e7f77bf4e1ef4640e4ee733f9e2a78@postgrespro.ru
| -rw-r--r-- | meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 01c0f11b862..7cf518a2765 100644 --- a/meson.build +++ b/meson.build @@ -1086,6 +1086,7 @@ endif perlopt = get_option('plperl') perl_dep = not_found_dep +perlversion = '' if not perlopt.disabled() perl_may_work = true @@ -1103,7 +1104,7 @@ if not perlopt.disabled() # Then inquire perl about its configuration if perl_may_work perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}'] - perlversion = run_command(perl_conf_cmd, 'api_versionstring', check: true).stdout() + perlversion = run_command(perl_conf_cmd, 'version', check: true).stdout() archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout() privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout() useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout() @@ -3825,7 +3826,7 @@ if meson.version().version_compare('>=0.57') 'nls': libintl, 'openssl': ssl, 'pam': pam, - 'plperl': perl_dep, + 'plperl': [perl_dep, perlversion], 'plpython': python3_dep, 'pltcl': tcl_dep, 'readline': readline, @@ -3836,6 +3837,7 @@ if meson.version().version_compare('>=0.57') 'zstd': zstd, }, section: 'External libraries', + list_sep: ' ', ) endif |