From nobody Tue Nov 18 09:20:11 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608579285; cv=none; d=zohomail.com; s=zohoarc; b=PzC+M8ZSOaEQJBHu7GZf2SwzPc2CihDtZYDdxO9md4A6iVZ0tYpeDAdI8End+WymYJ8fks/+TQpjrvPpZuFninSFMTMLffjoM+A7FOnmxCGPyNBXvrpB1Qw+o7wNojukv1LJChz7t4TDduAwd418oQlZxHGZ5UOYbgOKn3+KUC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608579285; h=Content-Type: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=cerUCuLfNAoPI4An40BkKkZ+H8a+IdBgs1zZ6lcMQsQ=; b=J4zxlNO4GRFUN5iNwO+OT8OUYnFrLZnOF5GGGHEiGQ8N1mKSW6DtrYhZGdjQsm7pnQcRp6mmaVnMgdPYgzdbpAmKrs7QVxjWHE7n6TisWZd/JiDeqZRnsLzCkGDNnBXOJx+CMwAyCpbGitcG+bZQN+OtmEtV8oFnopVMFXM0r9k= 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 1608579285297558.7212072760981; Mon, 21 Dec 2020 11:34:45 -0800 (PST) Received: from localhost ([::1]:43606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krN97-00056B-1D for importer@patchew.org; Mon, 21 Dec 2020 10:30:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krMRJ-0004wp-Nx for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:33 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1krMRC-0007l9-Jy for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:33 -0500 Received: by mail-wr1-x42b.google.com with SMTP id q18so11333085wrn.1 for ; Mon, 21 Dec 2020 06:45:14 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id l5sm27439627wrv.44.2020.12.21.06.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 06:45:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cerUCuLfNAoPI4An40BkKkZ+H8a+IdBgs1zZ6lcMQsQ=; b=EobYR7HV31KkCRN6qa+MmUPKUpGgIhQaGvBr8ib9L+h8gKtsKLFA3ou+EeFscG18IO 0/3F3DHgE2e5uBXmgpMeS7KRoEcTvWGZ1C5YNYfYcrRBsdqfoBVEZjigNdBl17gyYjsM jsXTRbLGrgXosYq49NA2/YGZoi8A9qeM/DgT9Wfs2HmMW3oRNJyb0TisAHPdp1PeSWPY zr1kLl0WrVFP8gKRNFIPab21w7VAwIq73Ol8P4YHHzR0cI2qixoOwdIOO8zcyTO2uMZ4 jlzSzGbLJVewpRM9jJK4U8wgMRU4vhP2aHTARkO+MHKvxgd8a+biNc7f4f5JJs7nFjpb yG6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cerUCuLfNAoPI4An40BkKkZ+H8a+IdBgs1zZ6lcMQsQ=; b=rdADcH4pmu4CGt3AlVOdKwCQJIFbmZxNBT7nuGG5+mce1BfnhVD2buE7ee1IOS7HQ3 2ZSxj6iA7sApYJumu6iA5gqeBxGzP5ymx6eTLxHk3jZJNBnWD8habK2RTI73SWyitn71 U2FUZdWlCIJalePL+tONVcOCy9n3bgfKkm+Jjz3o8L60zHRZh6rAgKVdnIXO+w5MX5LT QG2hYqbGkz/jDVFnPCpt4ymT6RjDRMEXWQYMJE0ktt6lvm9wV6IDXxwusS1pHAiKZeqh 7Jf5Y8MHqKaW1hb3VYXpA+0Md57IE/wz3Ij90Fjid8TUH/f0hZJlqnN6ksGlaunSsvBW WbZg== X-Gm-Message-State: AOAM533YgFWubdQUXso9CH390fJR11YOp4okz7TO4RzfM/ngJbMCeRQp 4p/RHtVVfh036w7NdoVmseFRxZZg0pY= X-Google-Smtp-Source: ABdhPJxv8egUFIZ1W91J+/RaHCDfatwbv2kg+iukn5Hc2h+kqP2wTz3IVPsoW5aTL25zw0nqLU/5rQ== X-Received: by 2002:a5d:6045:: with SMTP id j5mr18426081wrt.223.1608561913770; Mon, 21 Dec 2020 06:45:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 28/55] meson: fix detection of curses with pkgconfig Date: Mon, 21 Dec 2020 15:44:20 +0100 Message-Id: <20201221144447.26161-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201221144447.26161-1-pbonzini@redhat.com> References: <20201221144447.26161-1-pbonzini@redhat.com> 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=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 34ecb93b03..d5d08c8b6b 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