[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/46] meson: move config-host.h definitions together
From: |
Paolo Bonzini |
Subject: |
[PULL 37/46] meson: move config-host.h definitions together |
Date: |
Sun, 31 Dec 2023 09:44:53 +0100 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index 5c54441a3cd..151db21c038 100644
--- a/meson.build
+++ b/meson.build
@@ -40,7 +40,6 @@ qemu_moddir = get_option('libdir') / get_option('qemu_suffix')
qemu_desktopdir = get_option('datadir') / 'applications'
qemu_icondir = get_option('datadir') / 'icons'
-config_host_data = configuration_data()
genh = []
qapi_trace_events = []
@@ -233,12 +232,6 @@ elif cpu in ['riscv64']
else
kvm_targets = []
endif
-
-kvm_targets_c = '""'
-if get_option('kvm').allowed() and targetos == 'linux'
- kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"'
-endif
-config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c)
accelerator_targets = { 'CONFIG_KVM': kvm_targets }
if cpu in ['x86', 'x86_64']
@@ -1191,12 +1184,6 @@ if not get_option('virglrenderer').auto() or have_system
or have_vhost_user_gpu
virgl = dependency('virglrenderer',
method: 'pkg-config',
required: get_option('virglrenderer'))
- if virgl.found()
- config_host_data.set('HAVE_VIRGL_D3D_INFO_EXT',
- cc.has_member('struct
virgl_renderer_resource_info_ext', 'd3d_tex2d',
- prefix: '#include <virglrenderer.h>',
- dependencies: virgl))
- endif
endif
rutabaga = not_found
if not get_option('rutabaga_gfx').auto() or have_system or have_vhost_user_gpu
@@ -2008,6 +1995,8 @@ endif
# config-host.h #
#################
+config_host_data = configuration_data()
+
audio_drivers_selected = []
if have_system
audio_drivers_available = {
@@ -2137,6 +2126,12 @@ endif
config_host_data.set('HOST_' + host_arch.to_upper(), 1)
+kvm_targets_c = '""'
+if get_option('kvm').allowed() and targetos == 'linux'
+ kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"'
+endif
+config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c)
+
if get_option('module_upgrades') and not enable_modules
error('Cannot enable module-upgrades as modules are not enabled')
endif
@@ -2236,6 +2231,12 @@ config_host_data.set('CONFIG_PNG', png.found())
config_host_data.set('CONFIG_VNC', vnc.found())
config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
config_host_data.set('CONFIG_VNC_SASL', sasl.found())
+if virgl.found()
+ config_host_data.set('HAVE_VIRGL_D3D_INFO_EXT',
+ cc.has_member('struct
virgl_renderer_resource_info_ext', 'd3d_tex2d',
+ prefix: '#include <virglrenderer.h>',
+ dependencies: virgl))
+endif
config_host_data.set('CONFIG_VIRTFS', have_virtfs)
config_host_data.set('CONFIG_VTE', vte.found())
config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
--
2.43.0
- [PULL 23/46] target/i386: the sgx_epc_get_section stub is reachable, (continued)
- [PULL 23/46] target/i386: the sgx_epc_get_section stub is reachable, Paolo Bonzini, 2023/12/31
- [PULL 24/46] esp: check for NULL result from scsi_device_find(), Paolo Bonzini, 2023/12/31
- [PULL 39/46] meson: always probe u2f and canokey if the option is enabled, Paolo Bonzini, 2023/12/31
- [PULL 33/46] meson: move option validation together, Paolo Bonzini, 2023/12/31
- [PULL 27/46] meson: use version_compare() to compare version, Paolo Bonzini, 2023/12/31
- [PULL 30/46] configure: unify again the case arms in probe_target_compiler, Paolo Bonzini, 2023/12/31
- [PULL 44/46] meson: rename config_all, Paolo Bonzini, 2023/12/31
- [PULL 43/46] meson: remove CONFIG_ALL, Paolo Bonzini, 2023/12/31
- [PULL 45/46] configure, meson: rename targetos to host_os, Paolo Bonzini, 2023/12/31
- [PULL 26/46] meson: remove unused variable, Paolo Bonzini, 2023/12/31
- [PULL 37/46] meson: move config-host.h definitions together,
Paolo Bonzini <=
- [PULL 40/46] meson: remove OS definitions from config_targetos, Paolo Bonzini, 2023/12/31
- [PULL 36/46] meson: move CFI detection code with other compiler flags, Paolo Bonzini, 2023/12/31
- [PULL 42/46] meson: remove config_targetos, Paolo Bonzini, 2023/12/31
- [PULL 41/46] meson: remove CONFIG_POSIX and CONFIG_WIN32 from config_targetos, Paolo Bonzini, 2023/12/31
- [PULL 35/46] meson: keep subprojects together, Paolo Bonzini, 2023/12/31
- [PULL 46/46] meson.build: report graphics backends separately, Paolo Bonzini, 2023/12/31