From nobody Mon Nov 18 22:36:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602546434; cv=none; d=zohomail.com; s=zohoarc; b=G5PmUzu7L+DWMQwFols3CtHeAD52s/smWXz/lCYM5BK+ZpcDNq11Hp63mPXz3cV9mKcl7S4IvK8mm55czSBK5heyBmsWrVPPj6YxPb7m8cDmMOcGKoOd3qEp1uFLx8pLIMq6jsvP/y3jtH5j1P7XnBouhTSda/R951ENe8281Vw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602546434; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UA3F8s/BXSq76zUIOLr9d6u5/XdTz5OeWjQXz+7ww2E=; b=B8nI/FylT/c72TogTBwFTKFqgthzO316rt/nLz8aGZU6V6/ZH40wDjcUSpZd5L1cFSsK/Ey0WLUtuwxuNs//dnY1Sq9wM3Oy7jwz2yiZpkJsMAV9fImIqVYbuUfsZEa3u8JeSioxcNhUIL42r6UY5d01t9F8InhjoL6Ft9m3FJA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602546434256474.2667640516497; Mon, 12 Oct 2020 16:47:14 -0700 (PDT) Received: from localhost ([::1]:42944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kS7X7-0003P5-6x for importer@patchew.org; Mon, 12 Oct 2020 19:47:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kS7UX-0000PI-5q; Mon, 12 Oct 2020 19:44:33 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:36971) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kS7US-0007k0-6G; Mon, 12 Oct 2020 19:44:32 -0400 Received: by mail-pf1-x429.google.com with SMTP id 144so15259766pfb.4; Mon, 12 Oct 2020 16:44:27 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id j3sm9714890pjv.20.2020.10.12.16.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 16:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UA3F8s/BXSq76zUIOLr9d6u5/XdTz5OeWjQXz+7ww2E=; b=BwHbrneq/frl7kRBmaw/X99sftzcdIbYZIQfR8Wu7j5yFY8ynJpjWDokQmFUOg6Yli 2AlfRhcCY3OR5UOR+fT1DGZBJaORX59/nbOqYB5zweAMxY8PurpJjHx+ha5dkqFmkp0J kfgqxiRwRyLYGnlXGUCdNWA7BkSfw29Tevt/+uvhWTCSfzytW4a+sH3fD97jXptsBwWK 2o1A4arbGoAwjtoOuBK30JxoYhwN7oiDbgTf0Lawl16hcnndFZ+0586li6v+TlsMNr7X YLiWk3KWEl28IvXIkNv9ELXm2Wxbq+KZz8BaLqrkizqXF0I0KcYyLvJp/BobD/o9nhTH AITg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UA3F8s/BXSq76zUIOLr9d6u5/XdTz5OeWjQXz+7ww2E=; b=YvY1i8gB5urPty0QxyAvyQGog9lKAL2Lf1u6FP4OH5AoGobh8R92Y2m6dlFUpRt+yQ 9ndsxnkR6MOXBdexyVAOkIBUltbv4xCtYGkLxr5kd27ywg6zCZAJ0+DI+O8msdU4q+L/ Nsmvo18EChnsAYuAlr51vRzz9TW4ERz7sNYs5fAxqBKomHunjlxpCiCxFVyjOB0NwM/6 F6ZV6sXtLSMgZqokMpFXBVr4XC5ZgUElcapIWP35px8E/FfYhDLMSnx6zB4ZOoGPqFle CqnjJI2CxhlZSJQmITDML0Ogyo/b1FPcUrxme425EKumnTd6/3JuWhZ/BDr477WFcDSV b0+w== X-Gm-Message-State: AOAM532B0A/TssodKWn5L3BmqbOy+921mRx6Mdwwb5tLcvTuKzbbZJL7 mSBsi05nwILO33gEv9+TBhOB24eTzmbwHQ== X-Google-Smtp-Source: ABdhPJx2HWzo4chwzvmp16opIsq4QV2W2Mqz61hEsCSuhWxmvrynnmziXobgc1+Lld4Gm8Ejmom7Iw== X-Received: by 2002:a05:6a00:7d6:b029:152:3ccb:bc9e with SMTP id n22-20020a056a0007d6b02901523ccbbc9emr25999811pfu.57.1602546265746; Mon, 12 Oct 2020 16:44:25 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v9 5/5] configure: Fixes ncursesw detection under msys2/mingw by convert them to meson Date: Tue, 13 Oct 2020 07:43:48 +0800 Message-Id: <20201012234348.1427-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201012234348.1427-1-luoyonggang@gmail.com> References: <20201012234348.1427-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Trivial , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Laurent Vivier , Yonggang Luo , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The mingw pkg-config are showing following absolute path and contains : as = the separator, -D_XOPEN_SOURCE=3D600 -D_POSIX_C_SOURCE=3D199506L -IC:/CI-Tools/msys64/ming= w64/include/ncursesw:-I/usr/include/ncursesw: -DNCURSES_WIDECHAR -D_XOPEN_SOURCE=3D600 -D_POSIX_C_SOURCE=3D199506L -IC -p= ipe -lncursesw -lgnurx -ltre -lintl -liconv -DNCURSES_WIDECHAR -D_XOPEN_SOURCE=3D600 -D_POSIX_C_SOURCE=3D199506L -IC -l= ncursesw -DNCURSES_WIDECHAR -D_XOPEN_SOURCE=3D600 -D_POSIX_C_SOURCE=3D199506L -IC -l= cursesw -DNCURSES_WIDECHAR /CI-Tools/msys64/mingw64/include/ncursesw -pipe -lncurse= sw -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 Reviewed-by: Gerd Hoffmann --- configure | 118 +++------------------------------------------- meson.build | 83 +++++++++++++++++++++++++++----- meson_options.txt | 4 ++ ui/meson.build | 2 +- 4 files changed, 83 insertions(+), 124 deletions(-) diff --git a/configure b/configure index 9a87685517..f839c2a557 100755 --- a/configure +++ b/configure @@ -295,7 +295,8 @@ unset target_list_exclude =20 brlapi=3D"" curl=3D"" -curses=3D"" +iconv=3D"auto" +curses=3D"auto" docs=3D"" fdt=3D"auto" netmap=3D"no" @@ -1173,13 +1174,13 @@ for opt do ;; --disable-safe-stack) safe_stack=3D"no" ;; - --disable-curses) curses=3D"no" + --disable-curses) curses=3D"disabled" ;; - --enable-curses) curses=3D"yes" + --enable-curses) curses=3D"enabled" ;; - --disable-iconv) iconv=3D"no" + --disable-iconv) iconv=3D"disabled" ;; - --enable-iconv) iconv=3D"yes" + --enable-iconv) iconv=3D"enabled" ;; --disable-curl) curl=3D"no" ;; @@ -3440,102 +3441,6 @@ EOF fi fi =20 -########################################## -# iconv probe -if test "$iconv" !=3D "no" ; then - cat > $TMPC << EOF -#include -int main(void) { - iconv_t conv =3D iconv_open("WCHAR_T", "UCS-2"); - return conv !=3D (iconv_t) -1; -} -EOF - iconv_prefix_list=3D"/usr/local:/usr" - iconv_lib_list=3D":-liconv" - IFS=3D: - for iconv_prefix in $iconv_prefix_list; do - IFS=3D: - iconv_cflags=3D"-I$iconv_prefix/include" - iconv_ldflags=3D"-L$iconv_prefix/lib" - for iconv_link in $iconv_lib_list; do - unset IFS - iconv_lib=3D"$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=3Dyes - break - fi - done - if test "$iconv_found" =3D yes ; then - break - fi - done - if test "$iconv_found" =3D "yes" ; then - iconv=3Dyes - else - if test "$iconv" =3D "yes" ; then - feature_not_found "iconv" "Install iconv devel" - fi - iconv=3Dno - fi -fi - -########################################## -# curses probe -if test "$iconv" =3D "no" ; then - # curses will need iconv - curses=3Dno -fi -if test "$curses" !=3D "no" ; then - if test "$mingw32" =3D "yes" ; then - curses_inc_list=3D"$($pkg_config --cflags ncurses 2>/dev/null):" - curses_lib_list=3D"$($pkg_config --libs ncurses 2>/dev/null):-lpdcurse= s" - else - curses_inc_list=3D"$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr= /include/ncursesw:" - curses_lib_list=3D"$($pkg_config --libs ncursesw 2>/dev/null):-lncurse= sw:-lcursesw" - fi - curses_found=3Dno - cat > $TMPC << EOF -#include -#include -#include -int main(void) { - wchar_t wch =3D L'w'; - setlocale(LC_ALL, ""); - resize_term(0, 0); - addwstr(L"wide chars\n"); - addnwstr(&wch, 1); - add_wch(WACS_DEGREE); - return 0; -} -EOF - IFS=3D: - for curses_inc in $curses_inc_list; do - # Make sure we get the wide character prototypes - curses_inc=3D"-DNCURSES_WIDECHAR $curses_inc" - IFS=3D: - for curses_lib in $curses_lib_list; do - unset IFS - if compile_prog "$curses_inc" "$curses_lib" ; then - curses_found=3Dyes - break - fi - done - if test "$curses_found" =3D yes ; then - break - fi - done - unset IFS - if test "$curses_found" =3D "yes" ; then - curses=3Dyes - else - if test "$curses" =3D "yes" ; then - feature_not_found "curses" "Install ncurses devel" - fi - curses=3Dno - fi -fi - ########################################## # curl probe if test "$curl" !=3D "no" ; then @@ -6200,16 +6105,6 @@ if test "$have_x11" =3D "yes" && test "$need_x11" = =3D "yes"; then echo "X11_CFLAGS=3D$x11_cflags" >> $config_host_mak echo "X11_LIBS=3D$x11_libs" >> $config_host_mak fi -if test "$iconv" =3D "yes" ; then - echo "CONFIG_ICONV=3Dy" >> $config_host_mak - echo "ICONV_CFLAGS=3D$iconv_cflags" >> $config_host_mak - echo "ICONV_LIBS=3D$iconv_lib" >> $config_host_mak -fi -if test "$curses" =3D "yes" ; then - echo "CONFIG_CURSES=3Dy" >> $config_host_mak - echo "CURSES_CFLAGS=3D$curses_inc" >> $config_host_mak - echo "CURSES_LIBS=3D$curses_lib" >> $config_host_mak -fi if test "$pipe2" =3D "yes" ; then echo "CONFIG_PIPE2=3Dy" >> $config_host_mak fi @@ -7181,6 +7076,7 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_p= ng=3D$vnc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f \ -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt \ + -Diconv=3D$iconv -Dcurses=3D$curses \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index c23167c61b..8ad600a91a 100644 --- a/meson.build +++ b/meson.build @@ -424,6 +424,74 @@ if targetos =3D=3D 'linux' and have_tools and not get_= option('mpath').disabled() endif endif =20 +iconv =3D not_found +if not get_option('iconv').disabled() + libiconv =3D cc.find_library('iconv', + required: false, + static: enable_static) + if libiconv.found() + if cc.links(''' + #include + int main(void) { + iconv_t conv =3D iconv_open("WCHAR_T", "UCS-2"); + return conv !=3D (iconv_t) -1; + }''', dependencies: [libiconv]) + iconv =3D declare_dependency(dependencies: [libiconv]) + endif + endif +endif +if get_option('iconv').enabled() and not iconv.found() + error('Cannot detect iconv API') +endif + +curses =3D not_found +if iconv.found() and not get_option('curses').disabled() + curses_libname_list =3D ['ncursesw', 'ncurses', 'cursesw', 'pdcurses'] + curses_test =3D ''' + #include + #include + #include + int main(void) { + wchar_t wch =3D L'w'; + setlocale(LC_ALL, ""); + resize_term(0, 0); + addwstr(L"wide chars\n"); + addnwstr(&wch, 1); + add_wch(WACS_DEGREE); + return 0; + }''' + foreach curses_libname : curses_libname_list + libcurses =3D dependency(curses_libname, + required: false, + method: 'pkg-config', + static: enable_static) + + if not libcurses.found() + dirs =3D ['/usr/include/ncursesw'] + if targetos =3D=3D 'windows' + dirs =3D [] + endif + libcurses =3D cc.find_library(curses_libname, + required: false, + dirs: dirs, + static: enable_static) + endif + if libcurses.found() + if cc.links(curses_test, dependencies: [libcurses]) + curses =3D 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 =3D not_found if 'CONFIG_BRLAPI' in config_host brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) @@ -502,16 +570,6 @@ if 'CONFIG_X11' in config_host x11 =3D declare_dependency(compile_args: config_host['X11_CFLAGS'].split= (), link_args: config_host['X11_LIBS'].split()) endif -curses =3D not_found -if 'CONFIG_CURSES' in config_host - curses =3D declare_dependency(compile_args: config_host['CURSES_CFLAGS']= .split(), - link_args: config_host['CURSES_LIBS'].split(= )) -endif -iconv =3D not_found -if 'CONFIG_ICONV' in config_host - iconv =3D declare_dependency(compile_args: config_host['ICONV_CFLAGS'].s= plit(), - link_args: config_host['ICONV_LIBS'].split()) -endif vnc =3D not_found png =3D not_found jpeg =3D not_found @@ -618,6 +676,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()) @@ -1833,8 +1892,8 @@ if config_host.has_key('CONFIG_NETTLE') endif summary_info +=3D {'libtasn1': config_host.has_key('CONFIG_TASN1'= )} summary_info +=3D {'PAM': config_host.has_key('CONFIG_AUTH_P= AM')} -summary_info +=3D {'iconv support': config_host.has_key('CONFIG_ICONV'= )} -summary_info +=3D {'curses support': config_host.has_key('CONFIG_CURSES= ')} +summary_info +=3D {'iconv support': iconv.found()} +summary_info +=3D {'curses support': curses.found()} # TODO: add back version summary_info +=3D {'virgl support': config_host.has_key('CONFIG_VIRGL'= )} summary_info +=3D {'curl support': config_host.has_key('CONFIG_CURL')} diff --git a/meson_options.txt b/meson_options.txt index 1d3c94840a..e6cb1e589b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -32,6 +32,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) =20 ui_modules =3D {} =20 -if config_host.has_key('CONFIG_CURSES') +if curses.found() curses_ss =3D ss.source_set() curses_ss.add(when: [curses, iconv], if_true: [files('curses.c'), pixman= ]) ui_modules +=3D {'curses' : curses_ss} --=20 2.28.0.windows.1