* [PATCH v5 0/4] Fixes curses on msys2/mingw
@ 2020-09-18 16:02 Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 1/4] curses: Fixes compiler error that complain don't have langinfo.h " Yonggang Luo
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Yonggang Luo @ 2020-09-18 16:02 UTC (permalink / raw)
To: qemu-devel
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Yonggang Luo, Gerd Hoffmann,
Philippe Mathieu-Daudé
And also convert related configure script to meson.
Yonggang Luo (4):
curses: Fixes compiler error that complain don't have langinfo.h on
msys2/mingw
curses: Fixes curses compiling errors.
win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE
are defined on msys2/mingw
configure: Fixes ncursesw detection under msys2/mingw by convert them
to meson
configure | 155 ++------------------------------------
include/sysemu/os-win32.h | 4 +-
meson.build | 80 +++++++++++++++++---
meson_options.txt | 4 +
ui/curses.c | 14 ++--
ui/meson.build | 2 +-
util/oslib-win32.c | 4 +-
7 files changed, 91 insertions(+), 172 deletions(-)
--
2.28.0.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v5 1/4] curses: Fixes compiler error that complain don't have langinfo.h on msys2/mingw
2020-09-18 16:02 [PATCH v5 0/4] Fixes curses on msys2/mingw Yonggang Luo
@ 2020-09-18 16:02 ` Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 2/4] curses: Fixes curses compiling errors Yonggang Luo
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Yonggang Luo @ 2020-09-18 16:02 UTC (permalink / raw)
To: qemu-devel
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Yonggang Luo, Gerd Hoffmann,
Philippe Mathieu-Daudé
msys2/mingw lacks the POSIX-required langinfo.h.
gcc test.c -DNCURSES_WIDECHAR -I/mingw64/include/ncursesw -pipe -lncursesw -lgnurx -ltre -lintl -liconv
test.c:4:10: fatal error: langinfo.h: No such file or directory
4 | #include <langinfo.h>
| ^~~~~~~~~~~~
compilation terminated.
So we using g_get_codeset instead of nl_langinfo(CODESET)
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/curses.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/curses.c b/ui/curses.c
index a59b23a9cf..12bc682cf9 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -30,7 +30,6 @@
#endif
#include <locale.h>
#include <wchar.h>
-#include <langinfo.h>
#include <iconv.h>
#include "qapi/error.h"
@@ -526,6 +525,7 @@ static void font_setup(void)
iconv_t nativecharset_to_ucs2;
iconv_t font_conv;
int i;
+ g_autofree gchar *local_codeset = g_get_codeset();
/*
* Control characters are normally non-printable, but VGA does have
@@ -566,14 +566,14 @@ static void font_setup(void)
0x25bc
};
- ucs2_to_nativecharset = iconv_open(nl_langinfo(CODESET), "UCS-2");
+ ucs2_to_nativecharset = iconv_open(local_codeset, "UCS-2");
if (ucs2_to_nativecharset == (iconv_t) -1) {
fprintf(stderr, "Could not convert font glyphs from UCS-2: '%s'\n",
strerror(errno));
exit(1);
}
- nativecharset_to_ucs2 = iconv_open("UCS-2", nl_langinfo(CODESET));
+ nativecharset_to_ucs2 = iconv_open("UCS-2", local_codeset);
if (nativecharset_to_ucs2 == (iconv_t) -1) {
iconv_close(ucs2_to_nativecharset);
fprintf(stderr, "Could not convert font glyphs to UCS-2: '%s'\n",
@@ -581,7 +581,7 @@ static void font_setup(void)
exit(1);
}
- font_conv = iconv_open(nl_langinfo(CODESET), font_charset);
+ font_conv = iconv_open(local_codeset, font_charset);
if (font_conv == (iconv_t) -1) {
iconv_close(ucs2_to_nativecharset);
iconv_close(nativecharset_to_ucs2);
@@ -602,7 +602,7 @@ static void font_setup(void)
/* DEL */
convert_ucs(0x7F, 0x2302, ucs2_to_nativecharset);
- if (strcmp(nl_langinfo(CODESET), "UTF-8")) {
+ if (strcmp(local_codeset, "UTF-8")) {
/* Non-Unicode capable, use termcap equivalents for those available */
for (i = 0; i <= 0xFF; i++) {
wchar_t wch[CCHARW_MAX];
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/4] curses: Fixes curses compiling errors.
2020-09-18 16:02 [PATCH v5 0/4] Fixes curses on msys2/mingw Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 1/4] curses: Fixes compiler error that complain don't have langinfo.h " Yonggang Luo
@ 2020-09-18 16:02 ` Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 3/4] win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw Yonggang Luo
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Yonggang Luo @ 2020-09-18 16:02 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P . Berrangé,
QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Yonggang Luo, Gerd Hoffmann,
Philippe Mathieu-Daudé
This is the compiling error:
../ui/curses.c: In function 'curses_refresh':
../ui/curses.c:256:5: error: 'next_maybe_keycode' may be used uninitialized in this function [-Werror=maybe-uninitialized]
256 | curses2foo(_curses2keycode, _curseskey2keycode, chr, maybe_keycode)
| ^~~~~~~~~~
../ui/curses.c:302:32: note: 'next_maybe_keycode' was declared here
302 | enum maybe_keycode next_maybe_keycode;
| ^~~~~~~~~~~~~~~~~~
../ui/curses.c:256:5: error: 'maybe_keycode' may be used uninitialized in this function [-Werror=maybe-uninitialized]
256 | curses2foo(_curses2keycode, _curseskey2keycode, chr, maybe_keycode)
| ^~~~~~~~~~
../ui/curses.c:265:24: note: 'maybe_keycode' was declared here
265 | enum maybe_keycode maybe_keycode;
| ^~~~~~~~~~~~~
cc1.exe: all warnings being treated as errors
gcc version 10.2.0 (Rev1, Built by MSYS2 project)
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
ui/curses.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/curses.c b/ui/curses.c
index 12bc682cf9..e4f9588c3e 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -262,7 +262,7 @@ static int curses2foo(const int _curses2foo[], const int _curseskey2foo[],
static void curses_refresh(DisplayChangeListener *dcl)
{
int chr, keysym, keycode, keycode_alt;
- enum maybe_keycode maybe_keycode;
+ enum maybe_keycode maybe_keycode = CURSES_KEYCODE;
curses_winch_check();
@@ -299,7 +299,7 @@ static void curses_refresh(DisplayChangeListener *dcl)
/* alt or esc key */
if (keycode == 1) {
- enum maybe_keycode next_maybe_keycode;
+ enum maybe_keycode next_maybe_keycode = CURSES_KEYCODE;
int nextchr = console_getch(&next_maybe_keycode);
if (nextchr != -1) {
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 3/4] win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw
2020-09-18 16:02 [PATCH v5 0/4] Fixes curses on msys2/mingw Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 1/4] curses: Fixes compiler error that complain don't have langinfo.h " Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 2/4] curses: Fixes curses compiling errors Yonggang Luo
@ 2020-09-18 16:02 ` Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 4/4] configure: Fixes ncursesw detection under msys2/mingw by convert them to meson Yonggang Luo
2020-09-18 16:10 ` [PATCH v5 0/4] Fixes curses on msys2/mingw 罗勇刚(Yonggang Luo)
4 siblings, 0 replies; 8+ messages in thread
From: Yonggang Luo @ 2020-09-18 16:02 UTC (permalink / raw)
To: qemu-devel
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Yonggang Luo, Gerd Hoffmann,
Philippe Mathieu-Daudé
We remove the CONFIG_LOCALTIME_R detection option in configure, and move the check
existence of gmtime_r from configure into C header and source directly by using macro
`_POSIX_THREAD_SAFE_FUNCTIONS`.
Before this patch, the configure script are always assume the compiler doesn't define
_POSIX_C_SOURCE macro at all, but that's not true, because thirdparty library such
as ncursesw may define -D_POSIX_C_SOURCE in it's pkg-config file. And that C Flags will
added -D_POSIX_C_SOURCE into each QEMU_CFLAGS. And that's causing the following compiling error:
n file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../softmmu/main.c:25:
C:/work/xemu/qemu/include/sysemu/os-win32.h:53:12: error: redundant redeclaration of 'gmtime_r' [-Werror=redundant-decls]
53 | struct tm *gmtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../softmmu/main.c:25:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:284:36: note: previous definition of 'gmtime_r' was here
284 | __forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct tm *_Tm) {
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../softmmu/main.c:25:
C:/work/xemu/qemu/include/sysemu/os-win32.h:55:12: error: redundant redeclaration of 'localtime_r' [-Werror=redundant-decls]
55 | struct tm *localtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../softmmu/main.c:25:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:281:36: note: previous definition of 'localtime_r' was here
281 | __forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time, struct tm *_Tm) {
| ^~~~~~~~~~~
Compiling C object libcommon.fa.p/hw_gpio_zaurus.c.obj
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../hw/i2c/smbus_slave.c:16:
C:/work/xemu/qemu/include/sysemu/os-win32.h:53:12: error: redundant redeclaration of 'gmtime_r' [-Werror=redundant-decls]
53 | struct tm *gmtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../hw/i2c/smbus_slave.c:16:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:284:36: note: previous definition of 'gmtime_r' was here
284 | __forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct tm *_Tm) {
| ^~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:119,
from ../hw/i2c/smbus_slave.c:16:
C:/work/xemu/qemu/include/sysemu/os-win32.h:55:12: error: redundant redeclaration of 'localtime_r' [-Werror=redundant-decls]
55 | struct tm *localtime_r(const time_t *timep, struct tm *result);
| ^~~~~~~~~~~
In file included from C:/work/xemu/qemu/include/qemu/osdep.h:94,
from ../hw/i2c/smbus_slave.c:16:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/time.h:281:36: note: previous definition of 'localtime_r' was here
281 | __forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time, struct tm *_Tm) {
| ^~~~~~~~~~~
Compiling C object libcommon.fa.p/hw_dma_xilinx_axidma.c.obj
After this patch, whenever ncursesw or other thirdparty libraries tried to define or not
define _POSIX_C_SOURCE, the source will building properly. Because now, we don't make any
assumption if _POSIX_C_SOURCE are defined. We solely relied on if the macro `_POSIX_THREAD_SAFE_FUNCTIONS`
are defined in msys2/mingw header.
The _POSIX_THREAD_SAFE_FUNCTIONS are defined in mingw header like this:
```
#if defined(_POSIX_C_SOURCE) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
#endif
#ifdef _POSIX_THREAD_SAFE_FUNCTIONS
__forceinline struct tm *__CRTDECL localtime_r(const time_t *_Time, struct tm *_Tm) {
return localtime_s(_Tm, _Time) ? NULL : _Tm;
}
__forceinline struct tm *__CRTDECL gmtime_r(const time_t *_Time, struct tm *_Tm) {
return gmtime_s(_Tm, _Time) ? NULL : _Tm;
}
__forceinline char *__CRTDECL ctime_r(const time_t *_Time, char *_Str) {
return ctime_s(_Str, 0x7fffffff, _Time) ? NULL : _Str;
}
__forceinline char *__CRTDECL asctime_r(const struct tm *_Tm, char * _Str) {
return asctime_s(_Str, 0x7fffffff, _Tm) ? NULL : _Str;
}
#endif
```
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
configure | 34 ----------------------------------
include/sysemu/os-win32.h | 4 ++--
util/oslib-win32.c | 4 ++--
3 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/configure b/configure
index 422b1ef2a3..21c010140c 100755
--- a/configure
+++ b/configure
@@ -2499,37 +2499,6 @@ if test "$vhost_net" = ""; then
test "$vhost_kernel" = "yes" && vhost_net=yes
fi
-##########################################
-# MinGW / Mingw-w64 localtime_r/gmtime_r check
-
-if test "$mingw32" = "yes"; then
- # Some versions of MinGW / Mingw-w64 lack localtime_r
- # and gmtime_r entirely.
- #
- # Some versions of Mingw-w64 define a macro for
- # localtime_r/gmtime_r.
- #
- # Some versions of Mingw-w64 will define functions
- # for localtime_r/gmtime_r, but only if you have
- # _POSIX_THREAD_SAFE_FUNCTIONS defined. For fun
- # though, unistd.h and pthread.h both define
- # that for you.
- #
- # So this #undef localtime_r and #include <unistd.h>
- # are not in fact redundant.
-cat > $TMPC << EOF
-#include <unistd.h>
-#include <time.h>
-#undef localtime_r
-int main(void) { localtime_r(NULL, NULL); return 0; }
-EOF
- if compile_prog "" "" ; then
- localtime_r="yes"
- else
- localtime_r="no"
- fi
-fi
-
##########################################
# pkg-config probe
@@ -6943,9 +6912,6 @@ if [ "$bsd" = "yes" ] ; then
echo "CONFIG_BSD=y" >> $config_host_mak
fi
-if test "$localtime_r" = "yes" ; then
- echo "CONFIG_LOCALTIME_R=y" >> $config_host_mak
-fi
if test "$qom_cast_debug" = "yes" ; then
echo "CONFIG_QOM_CAST_DEBUG=y" >> $config_host_mak
fi
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
index d8978e28c0..5346d51e89 100644
--- a/include/sysemu/os-win32.h
+++ b/include/sysemu/os-win32.h
@@ -48,12 +48,12 @@
#define siglongjmp(env, val) longjmp(env, val)
/* Missing POSIX functions. Don't use MinGW-w64 macros. */
-#ifndef CONFIG_LOCALTIME_R
+#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
#undef gmtime_r
struct tm *gmtime_r(const time_t *timep, struct tm *result);
#undef localtime_r
struct tm *localtime_r(const time_t *timep, struct tm *result);
-#endif /* CONFIG_LOCALTIME_R */
+#endif /* _POSIX_THREAD_SAFE_FUNCTIONS */
static inline void os_setup_signal_handling(void) {}
static inline void os_daemonize(void) {}
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 051afb217b..e99debfb8d 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -106,7 +106,7 @@ void qemu_anon_ram_free(void *ptr, size_t size)
}
}
-#ifndef CONFIG_LOCALTIME_R
+#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
/* FIXME: add proper locking */
struct tm *gmtime_r(const time_t *timep, struct tm *result)
{
@@ -130,7 +130,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
}
return p;
}
-#endif /* CONFIG_LOCALTIME_R */
+#endif /* _POSIX_THREAD_SAFE_FUNCTIONS */
static int socket_error(void)
{
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 4/4] configure: Fixes ncursesw detection under msys2/mingw by convert them to meson
2020-09-18 16:02 [PATCH v5 0/4] Fixes curses on msys2/mingw Yonggang Luo
` (2 preceding siblings ...)
2020-09-18 16:02 ` [PATCH v5 3/4] win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw Yonggang Luo
@ 2020-09-18 16:02 ` Yonggang Luo
2020-09-18 16:10 ` [PATCH v5 0/4] Fixes curses on msys2/mingw 罗勇刚(Yonggang Luo)
4 siblings, 0 replies; 8+ messages in thread
From: Yonggang Luo @ 2020-09-18 16:02 UTC (permalink / raw)
To: qemu-devel
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Yonggang Luo, Gerd Hoffmann,
Philippe Mathieu-Daudé
The mingw pkg-config are showing following absolute path and contains : as the separator,
-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC:/CI-Tools/msys64/mingw64/include/ncursesw:-I/usr/include/ncursesw:
-DNCURSES_WIDECHAR -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC -pipe -lncursesw -lgnurx -ltre -lintl -liconv
-DNCURSES_WIDECHAR -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC -lncursesw
-DNCURSES_WIDECHAR -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L -IC -lcursesw
-DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -pipe -lncursesw -lgnurx -ltre -lintl -liconv
-DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -lncursesw
-DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -lcursesw
-DNCURSES_WIDECHAR -I/usr/include/ncursesw -pipe -lncursesw -lgnurx -ltre -lintl -liconv
-DNCURSES_WIDECHAR -I/usr/include/ncursesw -lncursesw
-DNCURSES_WIDECHAR -I/usr/include/ncursesw -lcursesw
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 121 +++-------------------------------------------
meson.build | 80 +++++++++++++++++++++++++-----
meson_options.txt | 4 ++
ui/meson.build | 2 +-
4 files changed, 80 insertions(+), 127 deletions(-)
diff --git a/configure b/configure
index 21c010140c..2ddb034aa5 100755
--- a/configure
+++ b/configure
@@ -396,7 +396,8 @@ unset target_list_exclude
brlapi=""
curl=""
-curses=""
+iconv="auto"
+curses="auto"
docs=""
fdt=""
netmap="no"
@@ -1285,13 +1286,13 @@ for opt do
;;
--disable-safe-stack) safe_stack="no"
;;
- --disable-curses) curses="no"
+ --disable-curses) curses="disabled"
;;
- --enable-curses) curses="yes"
+ --enable-curses) curses="enabled"
;;
- --disable-iconv) iconv="no"
+ --disable-iconv) iconv="disabled"
;;
- --enable-iconv) iconv="yes"
+ --enable-iconv) iconv="enabled"
;;
--disable-curl) curl="no"
;;
@@ -3581,105 +3582,6 @@ EOF
fi
fi
-##########################################
-# iconv probe
-if test "$iconv" != "no" ; then
- cat > $TMPC << EOF
-#include <iconv.h>
-int main(void) {
- iconv_t conv = iconv_open("WCHAR_T", "UCS-2");
- return conv != (iconv_t) -1;
-}
-EOF
- iconv_prefix_list="/usr/local:/usr"
- iconv_lib_list=":-liconv"
- IFS=:
- for iconv_prefix in $iconv_prefix_list; do
- IFS=:
- iconv_cflags="-I$iconv_prefix/include"
- iconv_ldflags="-L$iconv_prefix/lib"
- for iconv_link in $iconv_lib_list; do
- unset IFS
- iconv_lib="$iconv_ldflags $iconv_link"
- echo "looking at iconv in '$iconv_cflags' '$iconv_lib'" >> config.log
- if compile_prog "$iconv_cflags" "$iconv_lib" ; then
- iconv_found=yes
- break
- fi
- done
- if test "$iconv_found" = yes ; then
- break
- fi
- done
- if test "$iconv_found" = "yes" ; then
- iconv=yes
- else
- if test "$iconv" = "yes" ; then
- feature_not_found "iconv" "Install iconv devel"
- fi
- iconv=no
- fi
-fi
-
-##########################################
-# curses probe
-if test "$iconv" = "no" ; then
- # curses will need iconv
- curses=no
-fi
-if test "$curses" != "no" ; then
- if test "$mingw32" = "yes" ; then
- curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
- curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
- else
- curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
- curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
- fi
- curses_found=no
- cat > $TMPC << EOF
-#include <locale.h>
-#include <curses.h>
-#include <wchar.h>
-#include <langinfo.h>
-int main(void) {
- const char *codeset;
- wchar_t wch = L'w';
- setlocale(LC_ALL, "");
- resize_term(0, 0);
- addwstr(L"wide chars\n");
- addnwstr(&wch, 1);
- add_wch(WACS_DEGREE);
- codeset = nl_langinfo(CODESET);
- return codeset != 0;
-}
-EOF
- IFS=:
- for curses_inc in $curses_inc_list; do
- # Make sure we get the wide character prototypes
- curses_inc="-DNCURSES_WIDECHAR $curses_inc"
- IFS=:
- for curses_lib in $curses_lib_list; do
- unset IFS
- if compile_prog "$curses_inc" "$curses_lib" ; then
- curses_found=yes
- break
- fi
- done
- if test "$curses_found" = yes ; then
- break
- fi
- done
- unset IFS
- if test "$curses_found" = "yes" ; then
- curses=yes
- else
- if test "$curses" = "yes" ; then
- feature_not_found "curses" "Install ncurses devel"
- fi
- curses=no
- fi
-fi
-
##########################################
# curl probe
if test "$curl" != "no" ; then
@@ -6527,16 +6429,6 @@ if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then
echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak
echo "X11_LIBS=$x11_libs" >> $config_host_mak
fi
-if test "$iconv" = "yes" ; then
- echo "CONFIG_ICONV=y" >> $config_host_mak
- echo "ICONV_CFLAGS=$iconv_cflags" >> $config_host_mak
- echo "ICONV_LIBS=$iconv_lib" >> $config_host_mak
-fi
-if test "$curses" = "yes" ; then
- echo "CONFIG_CURSES=y" >> $config_host_mak
- echo "CURSES_CFLAGS=$curses_inc" >> $config_host_mak
- echo "CURSES_LIBS=$curses_lib" >> $config_host_mak
-fi
if test "$pipe2" = "yes" ; then
echo "CONFIG_PIPE2=y" >> $config_host_mak
fi
@@ -7816,6 +7708,7 @@ NINJA=${ninja:-$PWD/ninjatool} $meson setup \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
-Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
+ -Diconv=$iconv -Dcurses=$curses \
-Dmalloc=$malloc -Dmalloc_trim=$malloc_trim \
-Dcocoa=$cocoa -Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \
-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
diff --git a/meson.build b/meson.build
index ace15dc8c0..3088566ff4 100644
--- a/meson.build
+++ b/meson.build
@@ -340,6 +340,71 @@ if targetos == 'linux' and not get_option('mpath').disabled()
endif
endif
+iconv = not_found
+if not get_option('iconv').disabled()
+ libiconv = cc.find_library('iconv', 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
+ endif
+endif
+if get_option('iconv').enabled() and not iconv.found()
+ error('Cannot detect iconv API')
+endif
+
+curses = not_found
+if iconv.found() and not get_option('curses').disabled()
+ curses_libname_list = ['ncursesw', 'ncurses', 'cursesw', 'pdcurses']
+ foreach curses_libname : curses_libname_list
+ libcurses = dependency(curses_libname,
+ required: false,
+ method: 'pkg-config',
+ static: enable_static)
+
+ if not libcurses.found()
+ dirs = ['/usr/include/ncursesw']
+ if targetos == 'windows'
+ dirs = []
+ endif
+ libcurses = cc.find_library(curses_libname,
+ required: false,
+ dirs: dirs,
+ static: enable_static)
+ endif
+ if libcurses.found()
+ if cc.links('''
+ #include <locale.h>
+ #include <curses.h>
+ #include <wchar.h>
+ int main(void) {
+ wchar_t wch = L'w';
+ setlocale(LC_ALL, "");
+ resize_term(0, 0);
+ addwstr(L"wide chars\n");
+ addnwstr(&wch, 1);
+ add_wch(WACS_DEGREE);
+ return 0;
+ }''', compile_args: '-DNCURSES_WIDECHAR', dependencies: [libcurses])
+ curses = declare_dependency(compile_args: '-DNCURSES_WIDECHAR', dependencies: [libcurses])
+ break
+ endif
+ endif
+ endforeach
+endif
+if get_option('curses').enabled() and not curses.found()
+ if not iconv.found()
+ error('Cannot detect iconv API')
+ else
+ error('Cannot detect curses API')
+ endif
+endif
+
brlapi = not_found
if 'CONFIG_BRLAPI' in config_host
brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
@@ -418,16 +483,6 @@ if 'CONFIG_X11' in config_host
x11 = declare_dependency(compile_args: config_host['X11_CFLAGS'].split(),
link_args: config_host['X11_LIBS'].split())
endif
-curses = not_found
-if 'CONFIG_CURSES' in config_host
- curses = declare_dependency(compile_args: config_host['CURSES_CFLAGS'].split(),
- link_args: config_host['CURSES_LIBS'].split())
-endif
-iconv = not_found
-if 'CONFIG_ICONV' in config_host
- iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(),
- link_args: config_host['ICONV_LIBS'].split())
-endif
vnc = not_found
png = not_found
jpeg = not_found
@@ -544,6 +599,7 @@ config_host_data.set('CONFIG_COCOA', cocoa.found())
config_host_data.set('CONFIG_LIBUDEV', libudev.found())
config_host_data.set('CONFIG_MPATH', mpathpersist.found())
config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api)
+config_host_data.set('CONFIG_CURSES', curses.found())
config_host_data.set('CONFIG_SDL', sdl.found())
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
config_host_data.set('CONFIG_VNC', vnc.found())
@@ -1521,8 +1577,8 @@ if config_host.has_key('CONFIG_NETTLE')
endif
summary_info += {'libtasn1': config_host.has_key('CONFIG_TASN1')}
summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')}
-summary_info += {'iconv support': config_host.has_key('CONFIG_ICONV')}
-summary_info += {'curses support': config_host.has_key('CONFIG_CURSES')}
+summary_info += {'iconv support': iconv.found()}
+summary_info += {'curses support': curses.found()}
# TODO: add back version
summary_info += {'virgl support': config_host.has_key('CONFIG_VIRGL')}
summary_info += {'curl support': config_host.has_key('CONFIG_CURL')}
diff --git a/meson_options.txt b/meson_options.txt
index 46ea1d889a..a5d155a535 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,6 +15,10 @@ option('cocoa', type : 'feature', value : 'auto',
description: 'Cocoa user interface (macOS only)')
option('mpath', type : 'feature', value : 'auto',
description: 'Multipath persistent reservation passthrough')
+option('iconv', type : 'feature', value : 'auto',
+ description: 'Font glyph conversion support')
+option('curses', type : 'feature', value : 'auto',
+ description: 'curses UI')
option('sdl', type : 'feature', value : 'auto',
description: 'SDL user interface')
option('sdl_image', type : 'feature', value : 'auto',
diff --git a/ui/meson.build b/ui/meson.build
index 8a080c38e3..78ad792ffb 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -39,7 +39,7 @@ specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)
ui_modules = {}
-if config_host.has_key('CONFIG_CURSES')
+if curses.found()
curses_ss = ss.source_set()
curses_ss.add(when: [curses, iconv], if_true: [files('curses.c'), pixman])
ui_modules += {'curses' : curses_ss}
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v5 0/4] Fixes curses on msys2/mingw
2020-09-18 16:02 [PATCH v5 0/4] Fixes curses on msys2/mingw Yonggang Luo
` (3 preceding siblings ...)
2020-09-18 16:02 ` [PATCH v5 4/4] configure: Fixes ncursesw detection under msys2/mingw by convert them to meson Yonggang Luo
@ 2020-09-18 16:10 ` 罗勇刚(Yonggang Luo)
2020-09-19 15:03 ` Paolo Bonzini
4 siblings, 1 reply; 8+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-09-18 16:10 UTC (permalink / raw)
To: qemu-level
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Gerd Hoffmann, Paolo Bonzini,
Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 1080 bytes --]
Hi Bonzini, help to look at this, I convert curses and it's depends iconv
to meson
On Sat, Sep 19, 2020 at 12:03 AM Yonggang Luo <luoyonggang@gmail.com> wrote:
>
> And also convert related configure script to meson.
>
> Yonggang Luo (4):
> curses: Fixes compiler error that complain don't have langinfo.h on
> msys2/mingw
> curses: Fixes curses compiling errors.
> win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE
> are defined on msys2/mingw
> configure: Fixes ncursesw detection under msys2/mingw by convert them
> to meson
>
> configure | 155 ++------------------------------------
> include/sysemu/os-win32.h | 4 +-
> meson.build | 80 +++++++++++++++++---
> meson_options.txt | 4 +
> ui/curses.c | 14 ++--
> ui/meson.build | 2 +-
> util/oslib-win32.c | 4 +-
> 7 files changed, 91 insertions(+), 172 deletions(-)
>
> --
> 2.28.0.windows.1
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1375 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v5 0/4] Fixes curses on msys2/mingw
2020-09-18 16:10 ` [PATCH v5 0/4] Fixes curses on msys2/mingw 罗勇刚(Yonggang Luo)
@ 2020-09-19 15:03 ` Paolo Bonzini
2020-09-19 16:23 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2020-09-19 15:03 UTC (permalink / raw)
To: luoyonggang, qemu-level
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, Gerd Hoffmann, Philippe Mathieu-Daudé
On 18/09/20 18:10, 罗勇刚(Yonggang Luo) wrote:
>
>> Yonggang Luo (4):
>> curses: Fixes compiler error that complain don't have langinfo.h on
>> msys2/mingw
>> curses: Fixes curses compiling errors.
>> win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE
>> are defined on msys2/mingw
>> configure: Fixes ncursesw detection under msys2/mingw by convert them
>> to meson
Hi, patches 1-3 are okay, but for patch 4 I think it's better to wait
for Meson 0.56 which will likely embed all the magic needed to test
curses (https://github.com/mesonbuild/meson/pull/7757).
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v5 0/4] Fixes curses on msys2/mingw
2020-09-19 15:03 ` Paolo Bonzini
@ 2020-09-19 16:23 ` 罗勇刚(Yonggang Luo)
0 siblings, 0 replies; 8+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-09-19 16:23 UTC (permalink / raw)
To: Paolo Bonzini
Cc: QEMU Trivial, Alex Bennée, Richard Henderson,
Laurent Vivier, qemu-level, Gerd Hoffmann,
Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
On Sat, Sep 19, 2020 at 11:03 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 18/09/20 18:10, 罗勇刚(Yonggang Luo) wrote:
> >
> >> Yonggang Luo (4):
> >> curses: Fixes compiler error that complain don't have langinfo.h on
> >> msys2/mingw
> >> curses: Fixes curses compiling errors.
> >> win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE
> >> are defined on msys2/mingw
> >> configure: Fixes ncursesw detection under msys2/mingw by convert them
> >> to meson
>
> Hi, patches 1-3 are okay, but for patch 4 I think it's better to wait
> for Meson 0.56 which will likely embed all the magic needed to test
> curses (https://github.com/mesonbuild/meson/pull/7757).
>
> Paolo
>
Wonderfull, I think there is no need fixing configure anymore, so I convert
it to meson
Waiting https://github.com/mesonbuild/meson/pull/7757 to be merged.
In deed when I convert to meson, I am facing a problem that
DNCURSES_WIDECHAR can not be tested with the library.
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1568 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-19 16:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-18 16:02 [PATCH v5 0/4] Fixes curses on msys2/mingw Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 1/4] curses: Fixes compiler error that complain don't have langinfo.h " Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 2/4] curses: Fixes curses compiling errors Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 3/4] win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw Yonggang Luo
2020-09-18 16:02 ` [PATCH v5 4/4] configure: Fixes ncursesw detection under msys2/mingw by convert them to meson Yonggang Luo
2020-09-18 16:10 ` [PATCH v5 0/4] Fixes curses on msys2/mingw 罗勇刚(Yonggang Luo)
2020-09-19 15:03 ` Paolo Bonzini
2020-09-19 16:23 ` 罗勇刚(Yonggang Luo)
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.