[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/33] meson: Display libfdt as disabled when system emulation is
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 21/33] meson: Display libfdt as disabled when system emulation is disabled |
Date: |
Sun, 6 Mar 2022 13:59:48 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
Message-Id: <20220214183144.27402-2-f4bug@amsat.org>
---
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 038502714ab..746ce478e03 100644
--- a/meson.build
+++ b/meson.build
@@ -2432,8 +2432,8 @@
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,
@@ -2476,6 +2476,8 @@
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.35.1
- [PULL 11/33] accel: Introduce AccelOpsClass::cpus_are_resettable(), (continued)
- [PULL 11/33] accel: Introduce AccelOpsClass::cpus_are_resettable(), Philippe Mathieu-Daudé, 2022/03/06
- [PULL 12/33] softmmu/globals: Remove unused 'hw/i386/*' headers, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 13/33] softmmu/physmem: Remove unnecessary include, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 14/33] softmmu/cpu-timers: Remove unused 'exec/exec-all.h' header, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 15/33] misc: Remove unnecessary "sysemu/cpu-timers.h" include, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 16/33] misc: Add missing "sysemu/cpu-timers.h" include, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 17/33] exec/gdbstub: Make gdb_exit() / gdb_set_stop_cpu() target agnostic, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 18/33] exec/cpu: Make address_space_init/reloading_memory_map target agnostic, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 19/33] softmmu: Add qemu_init_arch_modules(), Philippe Mathieu-Daudé, 2022/03/06
- [PULL 20/33] softmmu: Build target-agnostic objects once, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 21/33] meson: Display libfdt as disabled when system emulation is disabled,
Philippe Mathieu-Daudé <=
- [PULL 22/33] exec/cpu_ldst: Include 'cpu.h' to get target_ulong definition, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 23/33] cpu: Add missing 'exec/exec-all.h' and 'qemu/accel.h' headers, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 25/33] Hexagon (target/hexagon) convert to OBJECT_DECLARE_TYPE, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 24/33] target/i386/tcg/sysemu: Include missing 'exec/exec-all.h' header, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 26/33] target: Include missing 'cpu.h', Philippe Mathieu-Daudé, 2022/03/06
- [PULL 27/33] target/hexagon: Add missing 'hw/core/cpu.h' include, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 28/33] target: Use forward declared type instead of structure type, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 29/33] target: Use CPUArchState as interface to target-specific CPU state, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 30/33] target: Introduce and use OBJECT_DECLARE_CPU_TYPE() macro, Philippe Mathieu-Daudé, 2022/03/06