From edfbc1f2f67eeb881673b0d83bd42e8afe89c4bf Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 19 Jul 2023 18:26:45 +0000 Subject: [PATCH] Merge pull request #1478 from ailin-nemui/buildperl update perl requirement in install file (cherry picked from commit 3f203dc3822b5f357fb3f64ce9020cf4ca367f46) --- INSTALL | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 3dbe2ebd..376960d1 100644 --- a/INSTALL +++ b/INSTALL @@ -7,7 +7,7 @@ To compile Irssi you need: - meson-0.49 build system with ninja-1.5 or greater - glib-2.32 or greater - openssl (for ssl support) -- perl-5.6 or greater (for Perl support) +- perl-5.8 or greater (for building, and optionally Perl scripts) - terminfo or ncurses (for text frontend) For most people, this should work just fine: diff --git a/meson.build b/meson.build index 1a8c23f3..064376c4 100644 --- a/meson.build +++ b/meson.build @@ -394,7 +394,7 @@ int main() else xsubpp_file_c = meson.get_cross_property('perl_xsubpp', UNSET) if xsubpp_file_c == UNSET - xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-Eprint $INC{"ExtUtils/ParseXS.pm"} =~ s{ParseXS\\.pm$}{xsubpp}r').stdout() + xsubpp_file_c = run_command(build_perl, '-MExtUtils::ParseXS', '-e($r = $INC{"ExtUtils/ParseXS.pm"}) =~ s{ParseXS\\.pm$}{xsubpp}; print $r').stdout() endif xsubpp = generator(build_perl, output : '@BASENAME@.c',