From nobody Tue Nov 18 07:41:54 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1609366772; cv=none; d=zohomail.com; s=zohoarc; b=gzJeM+D6r8hfn5tPXbfhA5qPx6+QcyBJLU2HLhgUgRsrSiwLyZ3lJojNByN8+LSw1Dl78qCRMQN3XcMIO1gHoQ8MlSG2lsp8xhqBIcVBzGjTk7LwbyDG3klmlFVhAQtp5xPwtKi0xirH+mrUgcWbjdM4KtG5gom2WWhClYO8y2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609366772; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=CZM6X1HG2XgdbArzslYvL7Ro945zOiEzB64apMgKPyo=; b=Fw+89v4QKKKGFJnW4kQB0U/XmPdqpbpPlH8cZQF33lyrZwE26RGZ/6O40RbxlcNkdY0LYyjEp3Zh3F52bphkQySYzGdLUbMwZeAzf1gBEly4eB82Ajf4vsYg2IZ8N4nFVxguh6dIuy5bJbNPPyx9D8c+UEn4D0tlSGLQ4vvBenM= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609366772868674.9898394548234; Wed, 30 Dec 2020 14:19:32 -0800 (PST) Received: from localhost ([::1]:44692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kujoZ-0008L5-Pa for importer@patchew.org; Wed, 30 Dec 2020 17:19:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kujmm-0007cx-BE for qemu-devel@nongnu.org; Wed, 30 Dec 2020 17:17:43 -0500 Received: from mail.namespace.at ([2a01:190:1801:100::235]:40368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kujmk-00027w-LM; Wed, 30 Dec 2020 17:17:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hofstaedtler.name; s=a; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CZM6X1HG2XgdbArzslYvL7Ro945zOiEzB64apMgKPyo=; b=lYkqNHIiGHSurdCbz8h8ntSAnQ LeADRDyws7lTW4ePf7aU2llhbuoWLqaXMLvYv94N2binnW3c0nEAg6OoPoDqYEgT/Rgq9Bp5KZcP7 ghM8G+KIiHseCCCwWVTPe0+Ez5B6waQzlXWRnL50GJjxGbwv234xLJTBQ6bGB4J485abhXs0j19l7 09Q1Dz/czI0KP30FD/leLvTuJA8Hd++1fE33+P+AAwXirnESOsZBpLZde7v1Sv2drDeOj/RyR9qsZ 1/tjv/lzocHB+yubXqJkGpqvqMvbFn3OGRqqzZt7dOEvR/3Be4UU1678bjNBQnjzrfVtqdry9rnpy z4iv9GUw==; From: Chris Hofstaedtler To: qemu-devel@nongnu.org Subject: [PATCH v2] meson: fix ncurses detection on macOS Date: Wed, 30 Dec 2020 23:17:27 +0100 Message-Id: <20201230221727.60579-1-chris@hofstaedtler.name> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a01:190:1801:100::235; envelope-from=chris@hofstaedtler.name; helo=mail.namespace.at 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, 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: Peter Maydell , Yonggang Luo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Samuel Thibault , Chris Hofstaedtler Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Without this, meson fails with "curses package not usable" when using ncurs= es 6.2. Apparently the wide functions (addwstr, etc) are hidden behind the ext= ra 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 Cc: Peter Maydell Cc: Philippe Mathieu-Daud=C3=A9 Cc: Samuel Thibault Cc: Yonggang Luo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Samuel Thibault Reviewed-by: Yonggang Luo Suggested-by: Yonggang Luo --- 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 =3D get_option('curses').enabled() ? 'curses library not found' : '' + curses_compile_args =3D ['-DNCURSES_WIDECHAR'] if curses.found() - if cc.links(curses_test, dependencies: [curses]) - curses =3D declare_dependency(compile_args: '-DNCURSES_WIDECHAR', de= pendencies: [curses]) + if cc.links(curses_test, args: curses_compile_args, dependencies: [cur= ses]) + curses =3D declare_dependency(compile_args: curses_compile_args, dep= endencies: [curses]) else msg =3D 'curses package not usable' curses =3D not_found endif 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') --=20 2.29.2