[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/55] build-sys: fix -static linking of libvhost-user
From: |
Paolo Bonzini |
Subject: |
[PULL 21/55] build-sys: fix -static linking of libvhost-user |
Date: |
Mon, 21 Dec 2020 15:44:13 +0100 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Fix linking vhost-user binaries with with ./configure -static, by
overriding glib-2.0 dependency with configure results.
Fixes: 0df750e9d3a5fea5e1 ("libvhost-user: make it a meson subproject")
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201215080319.136228-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 94ef023ad1..ada35d56e1 100644
--- a/meson.build
+++ b/meson.build
@@ -268,7 +268,11 @@ endif
# grandfathered in from the QEMU Makefiles.
add_project_arguments(config_host['GLIB_CFLAGS'].split(),
native: false, language: ['c', 'cpp', 'objc'])
-glib = declare_dependency(link_args: config_host['GLIB_LIBS'].split())
+glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
+ link_args: config_host['GLIB_LIBS'].split())
+# 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(),
--
2.29.2
- [PULL 00/55] Misc patches for 2020-12-21, Paolo Bonzini, 2020/12/21
- [PULL 01/55] gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build, Paolo Bonzini, 2020/12/21
- [PULL 02/55] configure: move gettext detection to meson.build, Paolo Bonzini, 2020/12/21
- [PULL 04/55] python: add __repr__ to ConsoleSocket to aid debugging, Paolo Bonzini, 2020/12/21
- [PULL 03/55] configure: add --without-default-features, Paolo Bonzini, 2020/12/21
- [PULL 05/55] gitlab: move --without-default-devices build from Travis, Paolo Bonzini, 2020/12/21
- [PULL 10/55] tests: update for rename of CentOS8 PowerTools repo, Paolo Bonzini, 2020/12/21
- [PULL 06/55] gitlab: add --without-default-features build, Paolo Bonzini, 2020/12/21
- [PULL 08/55] gitlab-CI: Test 32-bit builds with the fedora-i386-cross container, Paolo Bonzini, 2020/12/21
- [PULL 12/55] vl: initialize displays _after_ exiting preconfiguration, Paolo Bonzini, 2020/12/21
- [PULL 21/55] build-sys: fix -static linking of libvhost-user,
Paolo Bonzini <=
- [PULL 24/55] trace: do not include TCG helper tracepoints in no-TCG builds, Paolo Bonzini, 2020/12/21
- [PULL 31/55] meson: cleanup Kconfig.host handling, Paolo Bonzini, 2020/12/21
- [PULL 38/55] curl: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 11/55] configure: document --without-default-{features, devices}, Paolo Bonzini, 2020/12/21
- [PULL 07/55] tests/tcg: build tests with -Werror, Paolo Bonzini, 2020/12/21
- [PULL 14/55] qom: Assert that objects being destroyed have no parent, Paolo Bonzini, 2020/12/21
- [PULL 16/55] configure,meson: add option to enable LTO, Paolo Bonzini, 2020/12/21
- [PULL 17/55] cfi: Initial support for cfi-icall in QEMU, Paolo Bonzini, 2020/12/21
- [PULL 33/55] configure: remove variable bogus_os, Paolo Bonzini, 2020/12/21
- [PULL 40/55] bzip2: convert to meson, Paolo Bonzini, 2020/12/21