PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-26 04:51:11 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1314 from ailin-nemui/meson

Browse Source 
fix build with meson 0.58.0
This commit is contained in:
ailin-nemui 2021-05-10 13:14:40 +02:00 committed by GitHub
commit 768658f5d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/abicheck.yml vendored
View File

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

2
.github/workflows/check.yml vendored
View File

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

5
src/perl/meson.build
View File

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