[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/33] configure: fix detection of gdbus-codegen
From: |
Paolo Bonzini |
Subject: |
[PULL 32/33] configure: fix detection of gdbus-codegen |
Date: |
Tue, 11 May 2021 04:13:49 -0400 |
"pkg-config --variable=gdbus_codegen gio-2.0" returns "gdbus-codegen",
and it does not pass test -x (which does not walk the path).
Meson 0.58.0 notices that something is iffy, as the dbus_vmstate1
assignment in tests/qtest/meson.build uses an empty string as the
command, and fails very eloquently:
../tests/qtest/meson.build:92:2: ERROR: No program name specified.
Use the "has" function instead of test -x, and fix the generation
of config-host.mak since meson.build expects that GDBUS_CODEGEN
is absent, rather than empty, if the tool is unavailable.
Reported-by: Sebastian Mitterle <smitterl@redhat.com>
Fixes: #178
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 54f8475444..5877a6b2bf 100755
--- a/configure
+++ b/configure
@@ -3341,7 +3341,7 @@ if ! test "$gio" = "no"; then
gio_cflags=$($pkg_config --cflags gio-2.0)
gio_libs=$($pkg_config --libs gio-2.0)
gdbus_codegen=$($pkg_config --variable=gdbus_codegen gio-2.0)
- if [ ! -x "$gdbus_codegen" ]; then
+ if ! has "$gdbus_codegen"; then
gdbus_codegen=
fi
# Check that the libraries actually work -- Ubuntu 18.04 ships
@@ -5704,6 +5704,8 @@ if test "$gio" = "yes" ; then
echo "CONFIG_GIO=y" >> $config_host_mak
echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak
echo "GIO_LIBS=$gio_libs" >> $config_host_mak
+fi
+if test "$gdbus_codegen" != "" ; then
echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak
fi
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
--
2.26.2
- [PULL 20/33] accel: move call to accel_init_interfaces, (continued)
- [PULL 20/33] accel: move call to accel_init_interfaces, Paolo Bonzini, 2021/05/11
- [PULL 23/33] target/i386: move paging mode constants from SVM to cpu.h, Paolo Bonzini, 2021/05/11
- [PULL 17/33] target/i386: gdbstub: introduce aux functions to read/write CS64 regs, Paolo Bonzini, 2021/05/11
- [PULL 14/33] i386: split svm_helper into sysemu and stub-only user, Paolo Bonzini, 2021/05/11
- [PULL 11/33] i386: move TCG bpt_helper into sysemu/, Paolo Bonzini, 2021/05/11
- [PULL 10/33] i386: split tcg excp_helper into sysemu and user parts, Paolo Bonzini, 2021/05/11
- [PULL 12/33] i386: split misc helper user stubs and sysemu part, Paolo Bonzini, 2021/05/11
- [PULL 15/33] i386: split seg_helper into user-only and sysemu parts, Paolo Bonzini, 2021/05/11
- [PULL 13/33] i386: separate fpu_helper sysemu-only parts, Paolo Bonzini, 2021/05/11
- [PULL 22/33] target/i386: merge SVM_NPTEXIT_* with PF_ERROR_* constants, Paolo Bonzini, 2021/05/11
- [PULL 32/33] configure: fix detection of gdbus-codegen,
Paolo Bonzini <=
- [PULL 26/33] target/i386: extend pg_mode to more CR0 and CR4 bits, Paolo Bonzini, 2021/05/11
- [PULL 33/33] coverity-scan: list components, move model to scripts/coverity-scan, Paolo Bonzini, 2021/05/11
- [PULL 29/33] main-loop: remove dead code, Paolo Bonzini, 2021/05/11
- [PULL 25/33] target/i386: pass cr3 to mmu_translate, Paolo Bonzini, 2021/05/11
- [PULL 24/33] target/i386: extract mmu_translate, Paolo Bonzini, 2021/05/11
- [PULL 28/33] target/i386: use mmu_translate for NPT walk, Paolo Bonzini, 2021/05/11
- [PULL 21/33] accel: add init_accel_cpu for adapting accel behavior to CPU type, Paolo Bonzini, 2021/05/11
- [PULL 27/33] target/i386: allow customizing the next phase of the translation, Paolo Bonzini, 2021/05/11
- [PULL 31/33] qemu-option: support accept-any QemuOptsList in qemu_opts_absorb_qdict, Paolo Bonzini, 2021/05/11
- [PULL 30/33] migration: do not restart VM after successful snapshot-load, Paolo Bonzini, 2021/05/11