qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 03/20] meson: fix rule for qemu-ga installer
Date: Thu, 25 May 2023 16:15:15 +0200	[thread overview]
Message-ID: <20230525141532.295817-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20230525141532.295817-1-pbonzini@redhat.com>

The bindir variable is not available in the "glib" variable, which is an internal
dependency (created with "declare_dependency").  Use glib_pc instead, which contains
the variable as it is instantiated from glib-2.0.pc.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qga/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/meson.build b/qga/meson.build
index 622b5f94a232..d3291b4376cb 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -154,7 +154,7 @@ if targetos == 'windows'
                               qemu_ga_msi_arch[cpu],
                               qemu_ga_msi_vss,
                               '-D', 'BUILD_DIR=' + meson.project_build_root(),
-                              '-D', 'BIN_DIR=' + glib.get_variable('bindir'),
+                              '-D', 'BIN_DIR=' + glib_pc.get_variable('bindir'),
                               '-D', 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
                               '-D', 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
                               '-D', 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
-- 
2.40.1



  parent reply	other threads:[~2023-05-25 14:16 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-25 14:15 [PULL 00/20] Misc patches for 2023-05-25 Paolo Bonzini
2023-05-25 14:15 ` [PULL 01/20] target/i386: EPYC-Rome model without XSAVES Paolo Bonzini
2023-05-25 14:15 ` [PULL 02/20] meson.build: Fix glib -Wno-unused-function workaround Paolo Bonzini
2023-05-25 14:15 ` Paolo Bonzini [this message]
2023-05-25 14:15 ` [PULL 04/20] meson: move -no-pie from linker to compiler Paolo Bonzini
2023-05-25 14:15 ` [PULL 05/20] tests/docker: simplify HOST_ARCH definition Paolo Bonzini
2023-05-25 14:15 ` [PULL 06/20] tests/vm: fix and " Paolo Bonzini
2023-05-25 14:15 ` [PULL 07/20] Makefile: remove $(TESTS_PYTHON) Paolo Bonzini
2023-05-25 14:15 ` [PULL 08/20] usb/ohci: Set pad to 0 after frame update Paolo Bonzini
2023-05-25 14:15 ` [PULL 09/20] softmmu/ioport.c: allocate MemoryRegionPortioList ports on the heap Paolo Bonzini
2023-05-25 14:15 ` [PULL 10/20] softmmu/ioport.c: QOMify MemoryRegionPortioList Paolo Bonzini
2023-05-25 14:15 ` [PULL 11/20] softmmu/ioport.c: make MemoryRegionPortioList owner of portio_list MemoryRegions Paolo Bonzini
2023-05-25 14:15 ` [PULL 12/20] monitor: use QEMU_LOCK_GUARD a bit more Paolo Bonzini
2023-05-25 14:15 ` [PULL 13/20] monitor: allow calling monitor_resume under mon_lock Paolo Bonzini
2023-05-25 14:15 ` [PULL 14/20] monitor: add more *_locked() functions Paolo Bonzini
2023-05-25 14:15 ` [PULL 15/20] monitor: do not use mb_read/mb_set for suspend_cnt Paolo Bonzini
2023-05-25 14:15 ` [PULL 16/20] monitor: cleanup detection of qmp_dispatcher_co shutting down Paolo Bonzini
2023-05-25 14:15 ` [PULL 17/20] monitor: cleanup fetching of QMP requests Paolo Bonzini
2023-05-25 14:15 ` [PULL 18/20] monitor: introduce qmp_dispatcher_co_wake Paolo Bonzini
2023-05-25 14:15 ` [PULL 19/20] monitor: extract request dequeuing to a new function Paolo Bonzini
2023-05-25 14:15 ` [PULL 20/20] monitor: do not use mb_read/mb_set Paolo Bonzini
2023-05-25 17:15 ` [PULL 00/20] Misc patches for 2023-05-25 Richard Henderson

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=20230525141532.295817-4-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).