qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH] meson: fix qxl module build
Date: Thu, 27 Aug 2020 08:46:29 +0200	[thread overview]
Message-ID: <20200827064629.23080-1-kraxel@redhat.com> (raw)

Drop qxl object from softmmu source set, it is built as module.

Also drop CONFIG_QXL condition from qxl_ss.add.  First because it is
pointless, the whole thing is wrapped into "has_key('CONFIG_QXL')".
Second because it doesn't work for some reason.  Looks like the source
files are not added to the set for some reason and we end up with an
empty hw-display-qxl.so.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/display/meson.build b/hw/display/meson.build
index 78adaf9db463..becbedd24c23 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -41,12 +41,10 @@ specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
 
 if config_all_devices.has_key('CONFIG_QXL')
   qxl_ss = ss.source_set()
-  qxl_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
+  qxl_ss.add(files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
   hw_display_modules += {'qxl': qxl_ss}
 endif
 
-softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
-
 softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
 softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
 
-- 
2.27.0



             reply	other threads:[~2020-08-27  6:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-27  6:46 Gerd Hoffmann [this message]
2020-08-27 10:45 ` [PATCH] meson: fix qxl module build Marc-André Lureau
2020-09-04  8:12 ` Gerd Hoffmann
2020-09-04  9:02   ` Paolo Bonzini
2020-09-04 12:14     ` Gerd Hoffmann
2020-09-04 12:24       ` Paolo Bonzini

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=20200827064629.23080-1-kraxel@redhat.com \
    --to=kraxel@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).