qemu-stable
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] configure: fix detection of gdbus-codegen


From: Thomas Huth
Subject: Re: [PATCH] configure: fix detection of gdbus-codegen
Date: Fri, 28 May 2021 08:13:06 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0

On 05/05/2021 16.24, Paolo Bonzini wrote:
"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>
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


I think we should include this in the next stable release, too!

 Thomas




reply via email to

[Prev in Thread] Current Thread [Next in Thread]