[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/20] meson: fix rule for qemu-ga installer
|
From: |
Paolo Bonzini |
|
Subject: |
[PULL 03/20] meson: fix rule for qemu-ga installer |
|
Date: |
Thu, 25 May 2023 16:15:15 +0200 |
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
- [PULL 00/20] Misc patches for 2023-05-25, Paolo Bonzini, 2023/05/25
- [PULL 02/20] meson.build: Fix glib -Wno-unused-function workaround, Paolo Bonzini, 2023/05/25
- [PULL 01/20] target/i386: EPYC-Rome model without XSAVES, Paolo Bonzini, 2023/05/25
- [PULL 05/20] tests/docker: simplify HOST_ARCH definition, Paolo Bonzini, 2023/05/25
- [PULL 08/20] usb/ohci: Set pad to 0 after frame update, Paolo Bonzini, 2023/05/25
- [PULL 04/20] meson: move -no-pie from linker to compiler, Paolo Bonzini, 2023/05/25
- [PULL 07/20] Makefile: remove $(TESTS_PYTHON), Paolo Bonzini, 2023/05/25
- [PULL 03/20] meson: fix rule for qemu-ga installer,
Paolo Bonzini <=
- [PULL 13/20] monitor: allow calling monitor_resume under mon_lock, Paolo Bonzini, 2023/05/25
- [PULL 17/20] monitor: cleanup fetching of QMP requests, Paolo Bonzini, 2023/05/25
- [PULL 20/20] monitor: do not use mb_read/mb_set, Paolo Bonzini, 2023/05/25
- [PULL 18/20] monitor: introduce qmp_dispatcher_co_wake, Paolo Bonzini, 2023/05/25
- [PULL 06/20] tests/vm: fix and simplify HOST_ARCH definition, Paolo Bonzini, 2023/05/25
- [PULL 10/20] softmmu/ioport.c: QOMify MemoryRegionPortioList, Paolo Bonzini, 2023/05/25
- [PULL 09/20] softmmu/ioport.c: allocate MemoryRegionPortioList ports on the heap, Paolo Bonzini, 2023/05/25
- [PULL 14/20] monitor: add more *_locked() functions, Paolo Bonzini, 2023/05/25
- [PULL 11/20] softmmu/ioport.c: make MemoryRegionPortioList owner of portio_list MemoryRegions, Paolo Bonzini, 2023/05/25
- [PULL 12/20] monitor: use QEMU_LOCK_GUARD a bit more, Paolo Bonzini, 2023/05/25