Hi
On Fri, Dec 17, 2021 at 5:31 PM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:
> On 10/9/21 23:08, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Further meson configuration tests are to be added based on the glib
> > version. Also correct the version reporting in the config log.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > configure | 1 +
> > meson.build | 6 ++++--
> > 2 files changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/configure b/configure
> > index 375cde2b44..57e363fd73 100755
> > --- a/configure
> > +++ b/configure
> > @@ -4889,6 +4889,7 @@ echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
> > echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
> > echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
> > echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
> > +echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >>
> $config_host_mak
> > echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
> > echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
> > echo "EXESUF=$EXESUF" >> $config_host_mak
> > diff --git a/meson.build b/meson.build
> > index e1cddf5139..9494590aa2 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -311,14 +311,16 @@ endif
> > add_project_arguments(config_host['GLIB_CFLAGS'].split(),
> > native: false, language: ['c', 'cpp', 'objc'])
> > glib = declare_dependency(compile_args:
> config_host['GLIB_CFLAGS'].split(),
> > - link_args: config_host['GLIB_LIBS'].split())
> > + link_args: config_host['GLIB_LIBS'].split(),
> > + version: config_host['GLIB_VERSION'])
> > # override glib dep with the configure results (for subprojects)
> > meson.override_dependency('glib-2.0', glib)
> >
> > gio = not_found
> > if 'CONFIG_GIO' in config_host
> > gio = declare_dependency(compile_args:
> config_host['GIO_CFLAGS'].split(),
> > - link_args: config_host['GIO_LIBS'].split())
> > + link_args: config_host['GIO_LIBS'].split(),
> > + version: config_host['GLIB_VERSION'])
> > endif
> > lttng = not_found
> > if 'CONFIG_TRACE_UST' in config_host
> >
>
> Can you display it in summary_info too?
>
Yeah, although it would need a special treatment.
Since GLib is a mandatory dependency, I am not sure we want to show
GLib : YES
And because it's not a pkg-config dep, it doesn't show the version (could
probably be fixed in meson).
If you don't mind, I leave that for another day :)
> Otherwise:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>
>
thanks
--
Marc-André Lureau