Merge pull request #1314 from ailin-nemui/meson

fix build with meson 0.58.0

.github/workflows/abicheck.yml

@@ -4,7 +4,7 @@ env:
   build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
   prefix: /usr/local
   apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
-  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.58.0'
+  get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0'
   getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
   build-base-ref:

.github/workflows/check.yml

@@ -49,7 +49,7 @@ jobs:
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.58.0
+            meson_ver: <0.59.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK

src/perl/meson.build

@@ -14,6 +14,9 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h',
   command : [file2header, '@INPUT@', 'irssi_core_code'],
 )
 
+# required as of Meson 0.58.0
+generated_files_inc = include_directories('.')
+
 libperl_core_a = shared_module('perl_core',
   files(
     'perl-common.c',
@@ -29,7 +32,7 @@ libperl_core_a = shared_module('perl_core',
     def_perl_use_lib,
     '-D' + 'PERL_STATIC_LIBS' + '=' + 0.to_string(),
   ],
-  include_directories : rootinc,
+  include_directories : [ rootinc ] + [ generated_files_inc ],
   implicit_include_directories : false,
   install : true,
   install_dir : moduledir,