[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] meson.build: don't condition iconv detection on library dete
From: |
Paolo Bonzini |
Subject: |
Re: [PATCH] meson.build: don't condition iconv detection on library detection |
Date: |
Thu, 15 Oct 2020 19:12:57 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 |
On 15/10/20 00:19, Bruce Rogers wrote:
> It isn't necessarily the case that use of iconv requires an additional
> library. For that reason we shouldn't conditionalize iconv detection on
> libiconv.found.
>
> Fixes: 5285e593c33 (configure: Fixes ncursesw detection under msys2/mingw by
> convert them to meson)
>
> Signed-off-by: Bruce Rogers <brogers@suse.com>
> ---
> meson.build | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 1a4a482492..84c8ec9541 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -431,15 +431,13 @@ if not get_option('iconv').disabled()
> libiconv = cc.find_library('iconv',
> required: false,
> static: enable_static)
> - if libiconv.found()
> - if cc.links('''
> - #include <iconv.h>
> - int main(void) {
> - iconv_t conv = iconv_open("WCHAR_T", "UCS-2");
> - return conv != (iconv_t) -1;
> - }''', dependencies: [libiconv])
> - iconv = declare_dependency(dependencies: [libiconv])
> - endif
> + if cc.links('''
> + #include <iconv.h>
> + int main(void) {
> + iconv_t conv = iconv_open("WCHAR_T", "UCS-2");
> + return conv != (iconv_t) -1;
> + }''', dependencies: [libiconv])
> + iconv = declare_dependency(dependencies: [libiconv])
> endif
> endif
> if get_option('iconv').enabled() and not iconv.found()
>
Queued, thanks.
Paolo