[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/10] hw/core: Declare meson source set
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 03/10] hw/core: Declare meson source set |
Date: |
Mon, 1 Nov 2021 19:42:52 +0100 |
As we want to be able to conditionally add files to the hw/core
file list, use a source set.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Tested-by: Yanan Wang <wangyanan55@huawei.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20211028150521.1973821-3-philmd@redhat.com>
---
meson.build | 4 +++-
hw/core/meson.build | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index b0927283976..85f1e43dfe6 100644
--- a/meson.build
+++ b/meson.build
@@ -2365,6 +2365,7 @@
chardev_ss = ss.source_set()
common_ss = ss.source_set()
crypto_ss = ss.source_set()
+hwcore_ss = ss.source_set()
io_ss = ss.source_set()
linux_user_ss = ss.source_set()
qmp_ss = ss.source_set()
@@ -2806,7 +2807,8 @@
chardev = declare_dependency(link_whole: libchardev)
-libhwcore = static_library('hwcore', sources: hwcore_files + genh,
+hwcore_ss = hwcore_ss.apply(config_host, strict: false)
+libhwcore = static_library('hwcore', sources: hwcore_ss.sources() + genh,
name_suffix: 'fa',
build_by_default: false)
hwcore = declare_dependency(link_whole: libhwcore)
diff --git a/hw/core/meson.build b/hw/core/meson.build
index 6af4c5c5cbc..cc1ebb8e0f4 100644
--- a/hw/core/meson.build
+++ b/hw/core/meson.build
@@ -1,5 +1,5 @@
# core qdev-related obj files, also used by *-user and unit tests
-hwcore_files = files(
+hwcore_ss.add(files(
'bus.c',
'hotplug.c',
'qdev-properties.c',
@@ -11,7 +11,7 @@
'irq.c',
'clock.c',
'qdev-clock.c',
-)
+))
common_ss.add(files('cpu-common.c'))
softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
--
2.31.1
- [PULL 00/10] Machine-next patches for 2021-11-01, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 01/10] machine: Move gpio code to hw/core/gpio.c, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 02/10] hw/core: Restrict sysemu specific files, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 03/10] hw/core: Declare meson source set,
Philippe Mathieu-Daudé <=
- [PULL 04/10] hw/core: Extract hotplug-related functions to qdev-hotplug.c, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 05/10] hw/core: Restrict hotplug to system emulation, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 06/10] hw/core/machine: Split out the smp parsing code, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 07/10] tests/unit: Add an unit test for smp parsing, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 08/10] machine: add device_type_is_dynamic_sysbus function, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 09/10] qdev-monitor: Check sysbus device type before creating it, Philippe Mathieu-Daudé, 2021/11/01
- [PULL 10/10] machine: remove the done notifier for dynamic sysbus device type check, Philippe Mathieu-Daudé, 2021/11/01
- Re: [PULL 00/10] Machine-next patches for 2021-11-01, Richard Henderson, 2021/11/02