From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1D00C4361B for ; Sun, 13 Dec 2020 17:58:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CEDD1208D5 for ; Sun, 13 Dec 2020 17:58:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEDD1208D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koVdQ-00078a-F4 for qemu-devel@archiver.kernel.org; Sun, 13 Dec 2020 12:58:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koVcb-0006GV-Gx; Sun, 13 Dec 2020 12:57:25 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:46599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koVcZ-0005hM-3T; Sun, 13 Dec 2020 12:57:25 -0500 Received: from [192.168.100.1] ([82.252.135.218]) by mrelayeu.kundenserver.de (mreue010 [213.165.67.103]) with ESMTPSA (Nemesis) id 1MlNcr-1kPeyp2ZoL-00liri; Sun, 13 Dec 2020 18:57:18 +0100 Subject: Re: [PATCH 2/6] configure / meson: Move check for pty.h to meson.build To: Thomas Huth , qemu-devel@nongnu.org, Paolo Bonzini References: <20201118171052.308191-1-thuth@redhat.com> <20201118171052.308191-3-thuth@redhat.com> From: Laurent Vivier Message-ID: Date: Sun, 13 Dec 2020 18:57:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20201118171052.308191-3-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:6YMury8O/FBSOCO+9McSs3vYAfprE0sVEmkhFXNl+GzqTdViatH GVOPy8vilA4IK+MSNpiVyV4XD1/qHO87uwOPn2iIUFVANHDVzu5JeE+oi4dp+w3AGGKkadd hkwUO2/dNBa0K+XJ9FMZ/PA7sCnrW0IB299ImayzJEcGkahflN4MBqxyVTmNQADn8U936Cf 8vh47Yz6ifYUa1l8RMfdQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:w2jaitEbQ5Y=:PQs7rHAms/0BEC1ICU2n8m l4ljZL5xCIfv1XQIh6smYjNXIXqaa6VNaUfnD2XmxbCao4e32hOCFtHqrpl8w14OPE1QOBJ/x UmQ/SNJMYSYb6OciB8lB7faw8r3out32N9JEvos+OqNKuVVPWxCCOtUMbxjVAUyF6Uh/wtu2G /D0AFn/etlmfmYnXraO8i3drRY5Z67kYPZ59W3O8DpC5beYWr0G1kPUNvDdA1SnYYuHvY47kz QwMtkh2Z2TCevWmHiB2XiX4iAmP3JAWtnTjzxb+pH4ifn2zehSiYch/GniaMBy4HQg32J/y8w nNMvdVS10rBpKeXr9sPEO4RS3uRU1rkfqlVy8Xhp5OwBqEEPBYGm54NjDROlFQu361GDSoNMV btTdN0VbmCbhL1nWVKxaZt9lweZKMEy/WglyZSJrUb4ywLIGWu3Pzxc0/rkMi0R1bHX/0iMy4 hSMMRj+8eolhJwey88Y3qkY00mQj6sxm+HJU55Kl455UAIG6yx+N Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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@nongnu.org" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 18/11/2020 à 18:10, Thomas Huth a écrit : > This check can be done in a much shorter way in meson.build > > Signed-off-by: Thomas Huth > --- > configure | 9 --------- > meson.build | 1 + > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/configure b/configure > index 6c8f56c514..5a5e486373 100755 > --- a/configure > +++ b/configure > @@ -2319,12 +2319,6 @@ else > l2tpv3=no > fi > > -if check_include "pty.h" ; then > - pty_h=yes > -else > - pty_h=no > -fi > - > cat > $TMPC < #include > int main(int argc, char *argv[]) { > @@ -6667,9 +6661,6 @@ if test "$sheepdog" = "yes" ; then > add_to deprecated_features "sheepdog" > echo "CONFIG_SHEEPDOG=y" >> $config_host_mak > fi > -if test "$pty_h" = "yes" ; then > - echo "HAVE_PTY_H=y" >> $config_host_mak > -fi > if test "$have_mlockall" = "yes" ; then > echo "HAVE_MLOCKALL=y" >> $config_host_mak > fi > diff --git a/meson.build b/meson.build > index 7ddf983ff7..97a6445249 100644 > --- a/meson.build > +++ b/meson.build > @@ -808,6 +808,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0] > config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1]) > config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]) > > +config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) > config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) > > ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target > Applied to my trivial-patches branch. Thanks, Laurent