Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1260459

Browse files
committed
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 <[email protected]> Discussion: https://postgr.es/m/[email protected]
1 parent fc51a60 commit 1260459

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

meson.build

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,7 @@ endif
10861086

10871087
perlopt = get_option('plperl')
10881088
perl_dep = not_found_dep
1089+
perlversion = ''
10891090
if not perlopt.disabled()
10901091
perl_may_work = true
10911092

@@ -1103,7 +1104,7 @@ if not perlopt.disabled()
11031104
# Then inquire perl about its configuration
11041105
if perl_may_work
11051106
perl_conf_cmd = [perl, '-MConfig', '-e', 'print $Config{$ARGV[0]}']
1106-
perlversion = run_command(perl_conf_cmd, 'api_versionstring', check: true).stdout()
1107+
perlversion = run_command(perl_conf_cmd, 'version', check: true).stdout()
11071108
archlibexp = run_command(perl_conf_cmd, 'archlibexp', check: true).stdout()
11081109
privlibexp = run_command(perl_conf_cmd, 'privlibexp', check: true).stdout()
11091110
useshrplib = run_command(perl_conf_cmd, 'useshrplib', check: true).stdout()
@@ -3825,7 +3826,7 @@ if meson.version().version_compare('>=0.57')
38253826
'nls': libintl,
38263827
'openssl': ssl,
38273828
'pam': pam,
3828-
'plperl': perl_dep,
3829+
'plperl': [perl_dep, perlversion],
38293830
'plpython': python3_dep,
38303831
'pltcl': tcl_dep,
38313832
'readline': readline,
@@ -3836,6 +3837,7 @@ if meson.version().version_compare('>=0.57')
38363837
'zstd': zstd,
38373838
},
38383839
section: 'External libraries',
3840+
list_sep: ' ',
38393841
)
38403842

38413843
endif

0 commit comments

Comments
 (0)