From: Samuel Thibault <samuel.thibault@gnu.org>
To: Chris Hofstaedtler <chris@hofstaedtler.name>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH v2] meson: fix ncurses detection on macOS
Date: Wed, 30 Dec 2020 23:19:50 +0100 [thread overview]
Message-ID: <20201230221950.m4ila6u5k56zg353@function> (raw)
In-Reply-To: <20201230221727.60579-1-chris@hofstaedtler.name>
Chris Hofstaedtler, le mer. 30 déc. 2020 23:17:27 +0100, a ecrit:
> Without this, meson fails with "curses package not usable" when using ncurses
> 6.2. Apparently the wide functions (addwstr, etc) are hidden behind the extra
> define, and meson does not define it at that detection stage.
>
> Regression from b01a4fd3bd7d6f2 ("configure: Define NCURSES_WIDECHAR if we're
> using curses"). The meson conversion has seen many iterations of the curses
> check, so pinpointing the exact commit breaking this is not so easy.
>
> Signed-off-by: Chris Hofstaedtler <chris@hofstaedtler.name>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Samuel Thibault <samuel.thibault@gnu.org>
> Cc: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
> meson.build | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 372576f82c..fd74728674 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -500,16 +500,16 @@ if have_system and not get_option('curses').disabled()
> endif
> endforeach
> msg = get_option('curses').enabled() ? 'curses library not found' : ''
> + curses_compile_args = ['-DNCURSES_WIDECHAR']
> if curses.found()
> - if cc.links(curses_test, dependencies: [curses])
> - curses = declare_dependency(compile_args: '-DNCURSES_WIDECHAR', dependencies: [curses])
> + if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
> + curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses])
> else
> msg = 'curses package not usable'
> curses = not_found
> endif
> endif
> if not curses.found()
> - curses_compile_args = ['-DNCURSES_WIDECHAR']
> has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
> if targetos != 'windows' and not has_curses_h
> message('Trying with /usr/include/ncursesw')
> --
> 2.29.2
>
next prev parent reply other threads:[~2020-12-30 22:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 22:17 [PATCH v2] meson: fix ncurses detection on macOS Chris Hofstaedtler
2020-12-30 22:19 ` Samuel Thibault [this message]
2020-12-31 15:05 ` 罗勇刚(Yonggang Luo)
2021-01-01 11:02 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201230221950.m4ila6u5k56zg353@function \
--to=samuel.thibault@gnu.org \
--cc=chris@hofstaedtler.name \
--cc=luoyonggang@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).