[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/14] meson: Display libfdt as disabled when system emulation
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 01/14] meson: Display libfdt as disabled when system emulation is disabled |
Date: |
Mon, 14 Feb 2022 19:31:31 +0100 |
When configuring QEMU with --disable-system, meson keeps showing
libfdt as "auto". Mark it as disabled instead.
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index df25e7a5e7..9460875693 100644
--- a/meson.build
+++ b/meson.build
@@ -2266,8 +2266,8 @@ if get_option('cfi') and slirp_opt == 'system'
endif
fdt = not_found
-fdt_opt = get_option('fdt')
if have_system
+ fdt_opt = get_option('fdt')
if fdt_opt in ['enabled', 'auto', 'system']
have_internal = fs.exists(meson.current_source_dir() /
'dtc/libfdt/Makefile.libfdt')
fdt = cc.find_library('fdt', kwargs: static_kwargs,
@@ -2310,6 +2310,8 @@ if have_system
fdt = declare_dependency(link_with: libfdt,
include_directories: fdt_inc)
endif
+else
+ fdt_opt = 'disabled'
endif
if not fdt.found() and fdt_required.length() > 0
error('fdt not available but required by targets ' + ', '.join(fdt_required))
--
2.34.1
- [PATCH v2 00/14] target: Use ArchCPU & CPUArchState as abstract interface to target CPU, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 01/14] meson: Display libfdt as disabled when system emulation is disabled,
Philippe Mathieu-Daudé <=
- [PATCH v2 02/14] hw/m68k/mcf: Add missing 'exec/hwaddr.h' header, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 03/14] hw/tricore: Remove unused and incorrect header, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 04/14] exec/cpu_ldst: Include 'cpu.h' to get target_ulong definition, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 05/14] cpu: Add missing 'exec/exec-all.h' and 'qemu/accel.h' headers, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 06/14] target/i386/cpu: Ensure accelerators set CPU addressble physical bits, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 07/14] target/i386/tcg/sysemu: Include missing 'exec/exec-all.h' header, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 08/14] Hexagon (target/hexagon) convert to OBJECT_DECLARE_TYPE, Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 09/14] target: Include missing 'cpu.h', Philippe Mathieu-Daudé, 2022/02/14
- [PATCH v2 10/14] target/hexagon: Add missing 'hw/core/cpu.h' include, Philippe Mathieu-Daudé, 2022/02/14