From nobody Mon Nov 17 09:48:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603720684; cv=none; d=zohomail.com; s=zohoarc; b=GPk8FzPZF+mH5tzjkU2sWe9QR9B9K5DxoDcniNjTPinEWjleDGDkE5OWBiasUyxKCo29XGaD1Kkj1W7dsj0+v9EJDVw9pshaZF2pTjZfLHDIl6vz2mknplP7LhHR/ASo4FC/UGECQ50xp2FGzZI6QQ4vYlGzjWBr0q05ytSyzM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603720684; h=Content-Type:Content-Transfer-Encoding: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=q2/1xW3dbH1Lhr/F+FHDrEtNrsWDFmpxnRil/jGCbtM=; b=Lol9kUGbEPSIq9CNbzTDPoWh56SNS8lirdKeAoz+dwRMCNCJpndcuolWiuSLEqj3E6H3YwOaPmD50BR64/i3CQJQFWx6szNAmHFHcCjcq98+BLuuBgcOhq/lm3TUC7rKSEP5wHcveeIj5CY2OInNLBqUbHT0rXkOZxQZz6bAv2w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1603720684203743.6756532674221; Mon, 26 Oct 2020 06:58:04 -0700 (PDT) Received: from localhost ([::1]:50674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX30d-0003ix-3j for importer@patchew.org; Mon, 26 Oct 2020 09:58:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2ug-0005hQ-G4 for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:51:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kX2uS-0001kt-Qx for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:51:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-313-kEk091TXOWCzPx1TR1rwIg-1; Mon, 26 Oct 2020 09:51:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CBE7188C12F for ; Mon, 26 Oct 2020 13:51:32 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 623016EF7B for ; Mon, 26 Oct 2020 13:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603720298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q2/1xW3dbH1Lhr/F+FHDrEtNrsWDFmpxnRil/jGCbtM=; b=QasAFqa7gJGxvdQYLIzdRGZiGaTfuFUAClscA40ZgLFQQYOvU8PLoXL9R/8DyrRwvW0SGr HiUe/lGm5GYOmD+chca2fx8IinGd8giQ3kt2FnsiSHq2C/gUiNiUs8I6GCa5/UzQyylxQ0 tpi2FC58wabEiv3WPF0WQ9l5eG+Y588= X-MC-Unique: kEk091TXOWCzPx1TR1rwIg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/17] meson: rewrite curses/iconv test Date: Mon, 26 Oct 2020 09:51:16 -0400 Message-Id: <20201026135131.3006712-3-pbonzini@redhat.com> In-Reply-To: <20201026135131.3006712-1-pbonzini@redhat.com> References: <20201026135131.3006712-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 02:39:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Redo the curses test to do the same tests that the configure check used to do. OpenBSD triggers the warning because it does not support NCURSES_WIDECHAR and thus the cc.links test fails. Signed-off-by: Paolo Bonzini --- meson.build | 127 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 54 deletions(-) diff --git a/meson.build b/meson.build index 7627a0ae46..0edde14ad7 100644 --- a/meson.build +++ b/meson.build @@ -465,70 +465,89 @@ endif iconv =3D not_found curses =3D not_found if have_system and not get_option('curses').disabled() - if not get_option('iconv').disabled() - libiconv =3D cc.find_library('iconv', - required: false, - static: enable_static) - 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]) + 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; + }''' + + curses =3D dependency((targetos =3D=3D 'windows' ? 'ncurses' : 'ncursesw= '), + required: false, + method: 'pkg-config', + static: enable_static) + msg =3D get_option('curses').enabled() ? 'curses library not found' : '' + if curses.found() + if cc.links(curses_test, dependencies: [curses]) + curses =3D declare_dependency(compile_args: '-DNCURSES_WIDECHAR', de= pendencies: [curses]) + else + msg =3D 'curses package not usable' + curses =3D not_found endif endif - if get_option('iconv').enabled() and not iconv.found() - error('Cannot detect iconv API') - endif - if iconv.found() - 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 + if not curses.found() + curses_compile_args =3D ['-DNCURSES_WIDECHAR'] + has_curses_h =3D cc.has_header('curses.h', args: curses_compile_args) + if targetos !=3D 'windows' and not has_curses_h + message('Trying with /usr/include/ncursesw') + curses_compile_args +=3D ['-I/usr/include/ncursesw'] + has_curses_h =3D cc.has_header('curses.h', args: curses_compile_args) + endif + if has_curses_h + curses_libname_list =3D (targetos =3D=3D 'windows' ? ['pdcurses'] : = ['ncursesw', 'cursesw']) + foreach curses_libname : curses_libname_list 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 + if libcurses.found() + if cc.links(curses_test, args: curses_compile_args, dependencies= : libcurses) + curses =3D declare_dependency(compile_args: curses_compile_arg= s, + dependencies: [libcurses]) + break + else + msg =3D 'curses library not usable' + endif endif + endforeach + endif + endif + if not get_option('iconv').disabled() + foreach link_args : [ ['-liconv'], [] ] + # Programs will be linked with glib and this will bring in libiconv = on FreeBSD. + # We need to use libiconv if available because mixing libiconv's hea= ders with + # the system libc does not work. + # However, without adding glib to the dependencies -L/usr/local/lib = will not be + # included in the command line and libiconv will not be found. + if cc.links(''' + #include + int main(void) { + iconv_t conv =3D iconv_open("WCHAR_T", "UCS-2"); + return conv !=3D (iconv_t) -1; + }''', args: config_host['GLIB_CFLAGS'].split() + config_host['GLIB= _LIBS'].split() + link_args) + iconv =3D declare_dependency(link_args: link_args, dependencies: g= lib) + break endif endforeach endif - if not curses.found() - if iconv.found() - if get_option('curses').enabled() - error('Cannot find curses') - endif - elif get_option('curses').enabled() - error('iconv required for curses UI but not available') + if curses.found() and not iconv.found() + if get_option('iconv').enabled() + error('iconv not available') + endif + msg =3D 'iconv required for curses UI but not available' + curses =3D not_found + endif + if not curses.found() and msg !=3D '' + if get_option('curses').enabled() + error(msg) else - warning('iconv required for curses UI but not available, disabling') + warning(msg + ', disabling') endif endif endif --=20 2.26.2