diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2024-04-28 14:29:44 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2024-05-04 21:05:48 +1000 |
| commit | 15a23386560c7c71ec103244761d127a38739e61 (patch) | |
| tree | 03ab217eab64989f22a63677b75ee3af76a24637 | |
| parent | 9548d6cc765b1a8dcf933e8b1b89d0bcc3e50209 (diff) | |
meson: use the custom meson provided intl dependency
Let meson deal with the system differences instead of handling
it manually.
The custom dependency was added in meson 0.59, then gained
static support with 0.60, and static support for cygwin with 0.61,
which is why the meson requirement is bumped to 0.61.
Debian bullseye ships meson 0.56, so switch to bookworm which
has 1.0.1
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb1a4a28..769f9b97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ arch-no-nls: - fakechroot meson test -C build debian: - image: debian:bullseye + image: debian:bookworm before_script: - apt update - > diff --git a/meson.build b/meson.build index 79fc3eff..bc2ef468 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project('pacman', 'sysconfdir=/etc', 'localstatedir=/var', ], - meson_version : '>= 0.56') + meson_version : '>= 0.61') libalpm_version = '14.0.0' @@ -79,12 +79,7 @@ conf.set_quoted('ROOTDIR', ROOTDIR) libintl = dependency('', required: false) if get_option('i18n') - if not cc.has_function('ngettext') - libintl = cc.find_library('intl', required : false, static: get_option('buildstatic')) - if not libintl.found() - error('ngettext not found but NLS support requested') - endif - endif + libintl = dependency('intl', static: get_option('buildstatic')) conf.set('ENABLE_NLS', 1) endif |