sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-13 01:13:08 -04:00
Code Issues Projects Releases Wiki Activity

Show plperl version in the meson setup summary.

Browse Source 
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
This commit is contained in:
Andrew Dunstan 2025-03-20 18:55:29 -04:00
parent fc51a60dd4
commit 12604593e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -1086,6 +1086,7 @@ endif
perlopt = get_option('plperl') perlopt = get_option('plperl')
perl_dep = not_found_dep perl_dep = not_found_dep
perlversion = ''
if not perlopt.disabled() if not perlopt.disabled()
perl_may_work = true perl_may_work = true
@ -1103,7 +1104,7 @@ if not perlopt.disabled()
# Then inquire perl about its configuration # Then inquire perl about its configuration
if perl_may_work if perl_may_work
perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}'] 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() archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout()
privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout() privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout()
useshrplib = run_command(perl_conf_cmd, 'useshrplib', 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, 'nls': libintl,
'openssl': ssl, 'openssl': ssl,
'pam': pam, 'pam': pam,
'plperl': perl_dep, 'plperl': [perl_dep, perlversion],
'plpython': python3_dep, 'plpython': python3_dep,
'pltcl': tcl_dep, 'pltcl': tcl_dep,
'readline': readline, 'readline': readline,
@ -3836,6 +3837,7 @@ if meson.version().version_compare('>=0.57')
'zstd': zstd, 'zstd': zstd,
}, },
section: 'External libraries', section: 'External libraries',
list_sep: ' ',
) )
endif endif