[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/7] meson: Fixes curses detection on msys2
From: |
Paolo Bonzini |
Subject: |
[PULL 4/7] meson: Fixes curses detection on msys2 |
Date: |
Wed, 18 Nov 2020 11:19:37 +0100 |
From: Yonggang Luo <luoyonggang@gmail.com>
Fixes regression on curses detection in msys2
by commit#925a40df2828d32d3aaaf022282cba81082fb263
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201116213106.589-1-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 7ddf983ff7..5062407c70 100644
--- a/meson.build
+++ b/meson.build
@@ -490,10 +490,15 @@ if have_system and not get_option('curses').disabled()
return 0;
}'''
- curses = dependency((targetos == 'windows' ? 'ncurses' : 'ncursesw'),
- required: false,
- method: 'pkg-config',
- static: enable_static)
+ curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] :
['ncursesw']
+ foreach curses_dep : curses_dep_list
+ if not curses.found()
+ curses = dependency(curses_dep,
+ required: false,
+ method: 'pkg-config',
+ static: enable_static)
+ endif
+ endforeach
msg = get_option('curses').enabled() ? 'curses library not found' : ''
if curses.found()
if cc.links(curses_test, dependencies: [curses])
--
2.28.0
- [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Paolo Bonzini, 2020/11/18
- [PULL 1/7] meson: Fix argument for makensis (build regression), Paolo Bonzini, 2020/11/18
- [PULL 2/7] docs: Fix some typos (found by codespell), Paolo Bonzini, 2020/11/18
- [PULL 4/7] meson: Fixes curses detection on msys2,
Paolo Bonzini <=
- [PULL 3/7] meson: Fix build with --disable-guest-agent-msi, Paolo Bonzini, 2020/11/18
- [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET, Paolo Bonzini, 2020/11/18
- [PULL 6/7] hvf: Fix segment selector format, Paolo Bonzini, 2020/11/18
- [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file, Paolo Bonzini, 2020/11/18
- Re: [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Peter Maydell, 2020/11/18