qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 11/15] meson: fix dependencies for modinfo
Date: Thu, 22 Jul 2021 17:36:08 +0200	[thread overview]
Message-ID: <20210722153612.955537-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20210722153612.955537-1-pbonzini@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".

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 6e4d2d8034..eb85fe8e44 100644
--- a/meson.build
+++ b/meson.build
@@ -2335,9 +2335,9 @@ foreach d, list : modules
         # https://github.com/mesonbuild/meson/pull/8900
         modinfo_files += custom_target(d + '-' + m + '.modinfo',
                                        output: d + '-' + m + '.modinfo',
-                                       input: module_ss.sources(),
+                                       input: module_ss.sources() + genh,
                                        capture: true,
-                                       command: [modinfo_collect, '@INPUT@'])
+                                       command: [modinfo_collect, module_ss.sources()])
       endif
     else
       if d == 'block'
-- 
2.31.1




  parent reply	other threads:[~2021-07-22 15:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-22 15:35 [PULL 00/15] Misc bugfix patches for 2021-07-22 Paolo Bonzini
2021-07-22 15:35 ` [PULL 01/15] qemu-config: never call the callback after an error, fix leak Paolo Bonzini
2021-07-22 15:35 ` [PULL 02/15] qemu-config: fix memory leak on ferror() Paolo Bonzini
2021-07-22 15:36 ` [PULL 03/15] vl: Parse legacy default_machine_opts Paolo Bonzini
2021-07-22 15:36 ` [PULL 04/15] chardev-spice: add missing module_obj directive Paolo Bonzini
2021-07-22 17:41   ` Philippe Mathieu-Daudé
2021-07-22 15:36 ` [PULL 05/15] usb: fix usb-host dependency check Paolo Bonzini
2021-07-22 15:36 ` [PULL 06/15] qemu-config: restore "machine" in qmp_query_command_line_options() Paolo Bonzini
2021-07-22 15:36 ` [PULL 07/15] target/i386: Added V_INTR_PRIO check to virtual interrupts Paolo Bonzini
2021-07-22 15:36 ` [PULL 08/15] target/i386: Added consistency checks for CR4 Paolo Bonzini
2021-08-31 17:03   ` Richard W.M. Jones
2021-08-31 17:12     ` Daniel P. Berrangé
2021-08-31 17:35     ` Daniel P. Berrangé
2021-07-22 15:36 ` [PULL 09/15] target/i386: Added consistency checks for EFER Paolo Bonzini
2021-07-22 15:36 ` [PULL 10/15] configure: Drop obsolete check for the alloc_size attribute Paolo Bonzini
2021-07-22 15:36 ` Paolo Bonzini [this message]
2021-07-22 15:36 ` [PULL 12/15] configure: Fix --without-default-features propagation to meson Paolo Bonzini
2021-07-22 15:36 ` [PULL 13/15] configure: Allow vnc to get disabled with --without-default-features Paolo Bonzini
2021-07-22 15:36 ` [PULL 14/15] configure: Fix the default setting of the "xen" feature Paolo Bonzini
2021-07-22 15:36 ` [PULL 15/15] configure: Let --without-default-features disable vhost-kernel and vhost-vdpa Paolo Bonzini
2021-07-23 10:15 ` [PULL 00/15] Misc bugfix patches for 2021-07-22 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210722153612.955537-12-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).