| Message ID | 20191211134506.1803403-7-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add dbus-vmstate | expand |
On Wed, Dec 11, 2019 at 05:45:04PM +0400, Marc-André Lureau wrote: > gdbus-codegen generated code requires gio-unix on Unix, so add it to > GIO libs/cflags. What is the situation on Windows, is it still supported ? > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > configure | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/configure b/configure > index 6099be1d84..68a7705df7 100755 > --- a/configure > +++ b/configure > @@ -3720,10 +3720,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 > @@ -6949,6 +6955,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 > echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak > if test "$gnutls" = "yes" ; then Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
Hi On Thu, Dec 12, 2019 at 4:05 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > > On Wed, Dec 11, 2019 at 05:45:04PM +0400, Marc-André Lureau wrote: > > gdbus-codegen generated code requires gio-unix on Unix, so add it to > > GIO libs/cflags. > > What is the situation on Windows, is it still supported ? Yes, it should build fine. Only fd-passing related code is missing. > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > configure | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/configure b/configure > > index 6099be1d84..68a7705df7 100755 > > --- a/configure > > +++ b/configure > > @@ -3720,10 +3720,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 > > @@ -6949,6 +6955,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 > > echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak > > if test "$gnutls" = "yes" ; then > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| > >
diff --git a/configure b/configure index 6099be1d84..68a7705df7 100755 --- a/configure +++ b/configure @@ -3720,10 +3720,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 @@ -6949,6 +6955,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 echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak if test "$gnutls" = "yes" ; then
gdbus-codegen generated code requires gio-unix on Unix, so add it to GIO libs/cflags. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- configure | 7 +++++++ 1 file changed, 7 insertions(+)