[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] meson: fix dependencies for modinfo #2
From: |
Paolo Bonzini |
Subject: |
[PULL 1/9] meson: fix dependencies for modinfo #2 |
Date: |
Sat, 24 Jul 2021 10:54:45 +0200 |
From: Gerd Hoffmann <kraxel@redhat.com>
modinfo runs the preprocessor and therefore needs all generated input files
to be there. The "depends" clause does not work in Meson 0.55.3, so for
now use "input".
Part #2: Update the rule for target-specific modules too.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210723120156.1183920-1-kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index df5094e563..f2e148eaf9 100644
--- a/meson.build
+++ b/meson.build
@@ -2373,9 +2373,9 @@ foreach d, list : target_modules
# FIXME: Should use sl.extract_all_objects(recursive: true) too.
modinfo_files += custom_target(module_name + '.modinfo',
output: module_name + '.modinfo',
- input: target_module_ss.sources(),
+ input: target_module_ss.sources() +
genh,
capture: true,
- command: [modinfo_collect,
'--target', target, '@INPUT@'])
+ command: [modinfo_collect,
'--target', target, target_module_ss.sources()])
endif
endif
endforeach
--
2.31.1
- [PULL 0/9] Misc QEMU patches for 6.0-rc, Paolo Bonzini, 2021/07/24
- [PULL 1/9] meson: fix dependencies for modinfo #2,
Paolo Bonzini <=
- [PULL 2/9] target/i386: Added consistency checks for CR3, Paolo Bonzini, 2021/07/24
- [PULL 4/9] MAINTAINERS: Replace Eduardo as "Host Memory Backends" maintainer, Paolo Bonzini, 2021/07/24
- [PULL 9/9] qom: use correct field name when getting/setting alias properties, Paolo Bonzini, 2021/07/24
- [PULL 5/9] MAINTAINERS: Add Peter Xu and myself as co-maintainer of "Memory API", Paolo Bonzini, 2021/07/24
- [PULL 3/9] i386: do not call cpudef-only models functions for max, host, base, Paolo Bonzini, 2021/07/24
- [PULL 7/9] gitlab: only let pages be published from default branch, Paolo Bonzini, 2021/07/24
- [PULL 6/9] MAINTAINERS: Add memory_mapping.h and memory_mapping.c to "Memory API", Paolo Bonzini, 2021/07/24
- [PULL 8/9] qapi: introduce forwarding visitor, Paolo Bonzini, 2021/07/24
- Re: [PULL 0/9] Misc QEMU patches for 6.0-rc, Peter Maydell, 2021/07/24