On Wed, Dec 30, 2020 at 2:17 PM Chris Hofstaedtler <ch...@hofstaedtler.name>
wrote:
>
> 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 <ch...@hofstaedtler.name>
> Cc: Peter Maydell <peter.mayd...@linaro.org>
> Cc: Philippe Mathieu-Daudé <phi...@redhat.com>
> Cc: Samuel Thibault <samuel.thiba...@gnu.org>
> Cc: Yonggang Luo <luoyongg...@gmail.com>
> ---
> 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
>
Reviewed-by: Yonggang Luo <luoyongg...@gmail.com>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
