[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 24/36] build-sys: set glib dependency version
From: |
marcandre . lureau |
Subject: |
[PULL v2 24/36] build-sys: set glib dependency version |
Date: |
Tue, 21 Dec 2021 10:58:43 +0400 |
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>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 1 +
meson.build | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 8ccfe51673eb..51eae49daf7d 100755
--- a/configure
+++ b/configure
@@ -3694,6 +3694,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 1c70839bbf17..c37eb92ebeaa 100644
--- a/meson.build
+++ b/meson.build
@@ -404,14 +404,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 'ust' in get_option('trace_backends')
--
2.34.1.8.g35151cf07204
- [PULL v2 14/36] ui: simplify gl unblock & flush, (continued)
- [PULL v2 14/36] ui: simplify gl unblock & flush, marcandre . lureau, 2021/12/21
- [PULL v2 15/36] ui: dispatch GL events to all listeners, marcandre . lureau, 2021/12/21
- [PULL v2 16/36] ui: split the GL context in a different object, marcandre . lureau, 2021/12/21
- [PULL v2 17/36] ui: move qemu_spice_fill_device_address to ui/util.c, marcandre . lureau, 2021/12/21
- [PULL v2 18/36] console: save current scanout details, marcandre . lureau, 2021/12/21
- [PULL v2 19/36] scripts: teach modinfo to skip non-C sources, marcandre . lureau, 2021/12/21
- [PULL v2 20/36] docs/sphinx: add sphinx modules to include D-Bus documentation, marcandre . lureau, 2021/12/21
- [PULL v2 21/36] backends: move dbus-vmstate1.xml to backends/, marcandre . lureau, 2021/12/21
- [PULL v2 22/36] docs: move D-Bus VMState documentation to source XML, marcandre . lureau, 2021/12/21
- [PULL v2 23/36] docs: add dbus-display documentation, marcandre . lureau, 2021/12/21
- [PULL v2 24/36] build-sys: set glib dependency version,
marcandre . lureau <=
- [PULL v2 25/36] ui: add a D-Bus display backend, marcandre . lureau, 2021/12/21
- [PULL v2 26/36] ui/dbus: add p2p=on/off option, marcandre . lureau, 2021/12/21
- [PULL v2 27/36] tests/qtests: add qtest_qmp_add_client(), marcandre . lureau, 2021/12/21
- [PULL v2 28/36] tests: start dbus-display-test, marcandre . lureau, 2021/12/21
- [PULL v2 29/36] audio: add "dbus" audio backend, marcandre . lureau, 2021/12/21
- [PULL v2 30/36] ui/dbus: add clipboard interface, marcandre . lureau, 2021/12/21
- [PULL v2 31/36] chardev: teach socket to accept no addresses, marcandre . lureau, 2021/12/21
- [PULL v2 32/36] chardev: make socket derivable, marcandre . lureau, 2021/12/21
- [PULL v2 33/36] option: add g_auto for QemuOpts, marcandre . lureau, 2021/12/21
- [PULL v2 34/36] ui/dbus: add chardev backend & interface, marcandre . lureau, 2021/12/21