[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/17] configure: convert HAVE_BROKEN_SIZE_MAX to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 11/17] configure: convert HAVE_BROKEN_SIZE_MAX to meson |
Date: |
Mon, 5 Jul 2021 18:00:12 +0200 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
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 a524104120..98d6068941 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
@@ -5360,9 +5346,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 b5dcc3d70e..79b5834266 100644
--- a/meson.build
+++ b/meson.build
@@ -1268,6 +1268,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
- [PATCH 03/17] configure, meson: convert virgl detection to meson, (continued)
- [PATCH 03/17] configure, meson: convert virgl detection to meson, Paolo Bonzini, 2021/07/05
- [PATCH 15/17] configure: convert compiler tests to meson, part 4, Paolo Bonzini, 2021/07/05
- [PATCH 16/17] configure: convert compiler tests to meson, part 5, Paolo Bonzini, 2021/07/05
- [PATCH 12/17] configure: convert compiler tests to meson, part 1, Paolo Bonzini, 2021/07/05
- [PATCH 14/17] configure: convert compiler tests to meson, part 3, Paolo Bonzini, 2021/07/05
- [PATCH 10/17] configure, meson: move CONFIG_IVSHMEM to meson, Paolo Bonzini, 2021/07/05
- [PATCH 05/17] configure, meson: convert libpmem detection to meson, Paolo Bonzini, 2021/07/05
- [PATCH 13/17] configure: convert compiler tests to meson, part 2, Paolo Bonzini, 2021/07/05
- [PATCH 17/17] configure: convert compiler tests to meson, part 6, Paolo Bonzini, 2021/07/05
- [PATCH 11/17] configure: convert HAVE_BROKEN_SIZE_MAX to meson,
Paolo Bonzini <=
- [PATCH 09/17] meson: store dependency('threads') in a variable, Paolo Bonzini, 2021/07/05