Re: [PULL v2 6/9] configure: add GDBUS_CODEGEN

[Marc-André Lureau]

Hi

On Tue, Jan 7, 2020 at 8:14 PM Peter Maydell <address@hidden> wrote:
>
> On Mon, 6 Jan 2020 at 14:47, Marc-André Lureau
> <address@hidden> wrote:
> >
> > gdbus-codegen generated code requires gio-unix on Unix, so add it to
> > GIO libs/cflags.
> >
> > Signed-off-by: Marc-André Lureau <address@hidden>
> > Reviewed-by: Daniel P. Berrangé <address@hidden>
> > ---
> >  configure | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/configure b/configure
> > index 747d3b4120..0ce2c0354a 100755
> > --- a/configure
> > +++ b/configure
> > @@ -3701,10 +3701,16 @@ if $pkg_config --atleast-version=$glib_req_ver 
> > gio-2.0; then
> >      gio=yes
> >      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)
> >  else
> >      gio=no
> >  fi
> >
> > +if $pkg_config --atleast-version=$glib_req_ver gio-unix-2.0; then
> > +    gio_cflags="$gio_cflags $($pkg_config --cflags gio-unix-2.0)"
> > +    gio_libs="$gio_libs $($pkg_config --libs gio-unix-2.0)"
> > +fi
> > +
> >  # Sanity check that the current size_t matches the
> >  # size that glib thinks it should be. This catches
> >  # problems on multi-arch where people try to build
> > @@ -6904,6 +6910,7 @@ 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
> > +    echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak
> >  fi
>
> I've just noticed that this seems to cause problems for
> the NetBSD VM, because pkg-config reports a value for
> gdbus_codegen which isn't an installed binary:
>
> localhost$ pkg-config --variable=gdbus_codegen gio-2.0
> /usr/pkg/bin/gdbus-codegen
> localhost$ ls /usr/pkg/bin/gdbus-codegen
> ls: /usr/pkg/bin/gdbus-codegen: No such file or directory
>
> I think we need to install the 'gdbus-codegen' package in
> our netbsd VM image.
>
> Maybe configure should check that it's actually got
> an executable file before trying to use it?

Sure, that should be enough:

+    if [ ! -x "$gdbus_codegen" ]; then
+        gdbus_codegen=
+    fi

I can send the patch.