From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
qemu-trivial@nongnu.org, "Michael Tokarev" <mjt@tls.msk.ru>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 15/19] configure / meson: Move check for pty.h to meson.build
Date: Mon, 14 Dec 2020 16:57:29 +0100 [thread overview]
Message-ID: <20201214155733.207430-16-laurent@vivier.eu> (raw)
In-Reply-To: <20201214155733.207430-1-laurent@vivier.eu>
From: Thomas Huth <thuth@redhat.com>
This check can be done in a much shorter way in meson.build
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201118171052.308191-3-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
configure | 9 ---------
meson.build | 1 +
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/configure b/configure
index 1df5c848110e..39e61b275806 100755
--- a/configure
+++ b/configure
@@ -2332,12 +2332,6 @@ else
l2tpv3=no
fi
-if check_include "pty.h" ; then
- pty_h=yes
-else
- pty_h=no
-fi
-
cat > $TMPC <<EOF
#include <sys/mman.h>
int main(int argc, char *argv[]) {
@@ -6687,9 +6681,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 f344b25955f9..ef053c98376d 100644
--- a/meson.build
+++ b/meson.build
@@ -836,6 +836,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
--
2.29.2
next prev parent reply other threads:[~2020-12-14 16:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 15:57 [PULL 00/19] Trivial branch for 6.0 patches Laurent Vivier
2020-12-14 15:57 ` [PULL 01/19] target/i386: tracing: format length values as hex Laurent Vivier
2020-12-14 15:57 ` [PULL 02/19] qemu-options.hx: Fix minor issues in icount documentation Laurent Vivier
2020-12-14 15:57 ` [PULL 03/19] MAINTAINERS: update my email address Laurent Vivier
2020-12-14 15:57 ` [PULL 04/19] hw/xen: Don't use '#' flag of printf format Laurent Vivier
2020-12-14 15:57 ` [PULL 05/19] hw/pci-host/pam: Replace magic number by PAM_REGIONS_COUNT definition Laurent Vivier
2020-12-14 15:57 ` [PULL 06/19] fsdev: open brace '{' following struct go on the same line Laurent Vivier
2020-12-14 15:57 ` [PULL 07/19] CODING_STYLE.rst: Be less strict about 80 character limit Laurent Vivier
2020-12-14 15:57 ` [PULL 08/19] ads7846: moves from the hw/display folder to the hw/input folder Laurent Vivier
2020-12-14 15:57 ` [PULL 09/19] configure: Test if $make actually exists Laurent Vivier
2020-12-14 15:57 ` [PULL 10/19] elf2dmp/qemu_elf: Plug memleak in QEMU_Elf_init Laurent Vivier
2020-12-14 15:57 ` [PULL 11/19] elf2dmp/pdb: Plug memleak in pdb_init_from_file Laurent Vivier
2020-12-14 15:57 ` [PULL 12/19] block/file-posix: fix a possible undefined behavior Laurent Vivier
2020-12-14 15:57 ` [PULL 13/19] blockdev: Fix a memleak in drive_backup_prepare() Laurent Vivier
2020-12-14 15:57 ` [PULL 14/19] configure: Remove the obsolete check for ifaddrs.h Laurent Vivier
2020-12-14 15:57 ` Laurent Vivier [this message]
2020-12-14 15:57 ` [PULL 16/19] configure / meson: Move check for drm.h to meson.build Laurent Vivier
2020-12-14 15:57 ` [PULL 17/19] configure / meson: Move check for sys/signal.h " Laurent Vivier
2020-12-14 15:57 ` [PULL 18/19] configure / meson: Move check for sys/kcov.h " Laurent Vivier
2020-12-14 15:57 ` [PULL 19/19] configure / meson: Move check for linux/btrfs.h " Laurent Vivier
2020-12-15 12:03 ` [PULL 00/19] Trivial branch for 6.0 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201214155733.207430-16-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=mjt@tls.msk.ru \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).