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 5FDCFC433FE for ; Sun, 13 Dec 2020 17:59:54 +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 9E22622B51 for ; Sun, 13 Dec 2020 17:59:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E22622B51 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]:58280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koVey-0001On-OK for qemu-devel@archiver.kernel.org; Sun, 13 Dec 2020 12:59:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koVdT-0007kB-UB; Sun, 13 Dec 2020 12:58:19 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:45103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koVdS-0005ml-8m; Sun, 13 Dec 2020 12:58:19 -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-1kPfCK3RHx-00liyd; Sun, 13 Dec 2020 18:58:14 +0100 Subject: Re: [PATCH 3/6] configure / meson: Move check for drm.h to meson.build To: Thomas Huth , qemu-devel@nongnu.org, Paolo Bonzini References: <20201118171052.308191-1-thuth@redhat.com> <20201118171052.308191-4-thuth@redhat.com> From: Laurent Vivier Message-ID: Date: Sun, 13 Dec 2020 18:58:12 +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-4-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:ilN//mpyn0VsUptRhT3R6xReJFDD0y6TUzarUXAzfS93jF7N6P+ fZdnaCJgFdyGJROTXTm1JN+7h9ulIlNmrxFU0ZyxSImpwyEnN/2CPGE58Eh37Twlf8r7Gtk GAYmJJ/QKqC05PqYnp8nr5eMHbZ+0M+sYM/aPQ2gFCRS+2kc9sQoCr809ELd5DnpVg3reGw qpvIi3O2UEn33uf+2LODg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Eic9F1jrduQ=:mlg+Bkoh6TgY9DuF1g97KW VTDUdDmFtoEqDdf5/RB9YqqsHr64OJDua93zhlb/rgzrTKcYpmUSwM6pyl1j41/CL1RnmjxJY DOnwMxn8TU7t8vqJOcxeXstz24om1TikXBFWgnKb/xonWm33Qx98jGUOX19neJ7ys2ZdD5AWO BlKlQuH5QirB5HAgAi47iH67kz1BAkTWuvwpnUXQFnJNL2kMW5QKTdOguht4jpcReZmgvgVNP 1kJAKIZ5iEDdq6AYTU4/SuO/1EluwuWWhNuH0zjmbd0O3eMLnzPVXUSBNd0VhEY2vwyMVEtvU tgZVIQOzWMmJtzDKICIJHTGqDFupzgZdn2mD8aRnfgkC5lXfIbZsgn6pFughZFms69srsUGmn kQ7+T9jhsae6biTDAN2dCIzm6FSFFxrbYzEpbj9V1VM0yxGcMX9HTzM1VLi8qF2d8cDV9ykiN 7iZ5XC7SMQ== Received-SPF: none client-ip=212.227.126.130; 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 | 10 ---------- > meson.build | 1 + > 2 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/configure b/configure > index 5a5e486373..b3e1052a58 100755 > --- a/configure > +++ b/configure > @@ -3088,13 +3088,6 @@ EOF > fi > fi > > -######################################### > -# libdrm check > -have_drm_h=no > -if check_include "libdrm/drm.h" ; then > - have_drm_h=yes > -fi > - > ######################################### > # sys/signal.h check > have_sys_signal_h=no > @@ -6185,9 +6178,6 @@ fi > if test "$auth_pam" = "yes" ; then > echo "CONFIG_AUTH_PAM=y" >> $config_host_mak > fi > -if test "$have_drm_h" = "yes" ; then > - echo "HAVE_DRM_H=y" >> $config_host_mak > -fi > if test "$have_broken_size_max" = "yes" ; then > echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak > fi > diff --git a/meson.build b/meson.build > index 97a6445249..d6b633f17f 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_DRM_H', cc.has_header('libdrm/drm.h')) > 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')) > > Applied to my trivial-patches branch. Thanks, Laurent