v3-0011-Pass-feature-option-through-to-required-kwarg.patch
text/x-patch
Filename: v3-0011-Pass-feature-option-through-to-required-kwarg.patch
Type: text/x-patch
Part: 10
Message:
Re: Meson build updates
Patch
Format: format-patch
Series: patch v3-0011
Subject: Pass feature option through to required kwarg
| File | + | − |
|---|---|---|
| meson.build | 4 | 4 |
From ae741c434aef202917acd159422a8f7123b64575 Mon Sep 17 00:00:00 2001
From: Tristan Partin <tristan@neon.tech>
Date: Wed, 17 May 2023 09:38:09 -0500
Subject: [PATCH v3 11/15] Pass feature option through to required kwarg
Meson understands this already. No need to convert it to a boolean.
---
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 0ab31b3424..188dd81243 100644
--- a/meson.build
+++ b/meson.build
@@ -767,8 +767,8 @@ endif
icuopt = get_option('icu')
if not icuopt.disabled()
- icu = dependency('icu-uc', required: icuopt.enabled())
- icu_i18n = dependency('icu-i18n', required: icuopt.enabled())
+ icu = dependency('icu-uc', required: icuopt)
+ icu_i18n = dependency('icu-i18n', required: icuopt)
if icu.found()
cdata.set('USE_ICU', 1)
@@ -1077,7 +1077,7 @@ if not get_option('readline').disabled()
readline = dependency(readline_dep, required: false)
if not readline.found()
readline = cc.find_library(readline_dep,
- required: get_option('readline').enabled(),
+ required: get_option('readline'),
dirs: test_lib_d)
endif
if readline.found()
@@ -2537,7 +2537,7 @@ if not nlsopt.disabled()
# otherwise there'd be lots of
# "Gettext not found, all translation (po) targets will be ignored."
# warnings if not found.
- msgfmt = find_program('msgfmt', required: nlsopt.enabled(), native: true)
+ msgfmt = find_program('msgfmt', required: nlsopt, native: true)
# meson 0.59 has this wrapped in dependency('int')
if (msgfmt.found() and
--
Tristan Partin
Neon (https://neon.tech)