[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 18/26] configure: convert HAVE_BROKEN_SIZE_MAX to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 18/26] configure: convert HAVE_BROKEN_SIZE_MAX to meson |
Date: |
Tue, 8 Jun 2021 13:22:53 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 17 -----------------
meson.build | 9 +++++++++
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index c95259435f..e11174f810 100755
--- a/configure
+++ b/configure
@@ -2375,20 +2375,6 @@ if test "$softmmu" = "no"; then
audio_drv_list=""
fi
-##########################################
-# Some versions of Mac OS X incorrectly define SIZE_MAX
-cat > $TMPC << EOF
-#include <stdint.h>
-#include <stdio.h>
-int main(int argc, char *argv[]) {
- return printf("%zu", SIZE_MAX);
-}
-EOF
-have_broken_size_max=no
-if ! compile_object -Werror ; then
- have_broken_size_max=yes
-fi
-
##########################################
# L2TPV3 probe
@@ -5358,9 +5344,6 @@ if test "$gdbus_codegen" != "" ; then
echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak
fi
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
-if test "$have_broken_size_max" = "yes" ; then
- echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak
-fi
if test "$have_openpty" = "yes" ; then
echo "HAVE_OPENPTY=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 3be3ef0982..2a19f6c1bd 100644
--- a/meson.build
+++ b/meson.build
@@ -1270,6 +1270,15 @@ config_host_data.set('HAVE_SYS_KCOV_H',
cc.has_header('sys/kcov.h'))
config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix:
'#include <sys/uio.h>'))
config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix:
'#include <stdlib.h>'))
+# Some versions of Mac OS X incorrectly define SIZE_MAX
+config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
+ #include <stdint.h>
+ #include <stdio.h>
+ int main(int argc, char *argv[]) {
+ return printf("%zu", SIZE_MAX);
+ }''', args: ['-Werror']))
+
+
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST',
'CONFIG_BDRV_RO_WHITELIST']
strings = ['HOST_DSOSUF', 'CONFIG_IASL']
--
2.31.1
- Re: [PATCH 05/26] configure, meson: convert pam detection to meson, (continued)
Re: [PATCH 05/26] configure, meson: convert pam detection to meson, Daniel P . Berrangé, 2021/06/15
[PATCH 09/26] configure, meson: convert vte detection to meson, Paolo Bonzini, 2021/06/08
[PATCH 14/26] configure, meson: convert libxml2 detection to meson, Paolo Bonzini, 2021/06/08
[PATCH 16/26] meson: remove preadv from summary, Paolo Bonzini, 2021/06/08
[PATCH 18/26] configure: convert HAVE_BROKEN_SIZE_MAX to meson,
Paolo Bonzini <=
[PATCH 13/26] configure, meson: convert liburing detection to meson, Paolo Bonzini, 2021/06/08
[PATCH 15/26] meson: sort header tests, Paolo Bonzini, 2021/06/08
[PATCH 12/26] configure, meson: convert libpmem detection to meson, Paolo Bonzini, 2021/06/08