[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/46] meson: fix libqos linking
From: |
Paolo Bonzini |
Subject: |
[PULL 12/46] meson: fix libqos linking |
Date: |
Fri, 4 Sep 2020 07:40:48 -0400 |
Add genh to the sources to avoid race conditions between QAPI
file generation and libqos compilation.
Make the name_suffix .fa for consistency with other link_whole
static libraries and to work around a Meson issue where
lots of linker flags are placed between -Wl,--start-group and
-Wl,--end-group and this breaks the fork-fuzz.ld linker script.
Reported-by: Claudio Fontana <cfontana@suse.de>
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qtest/libqos/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
index 19931b9248..1cddf5bdaa 100644
--- a/tests/qtest/libqos/meson.build
+++ b/tests/qtest/libqos/meson.build
@@ -1,5 +1,4 @@
-libqos = static_library('qos',
- files('../libqtest.c',
+libqos_srcs = files('../libqtest.c',
'qgraph.c',
'qos_external.c',
'pci.c',
@@ -52,6 +51,10 @@ libqos = static_library('qos',
'arm-xilinx-zynq-a9-machine.c',
'ppc64_pseries-machine.c',
'x86_64_pc-machine.c',
-), build_by_default: false)
+)
+
+libqos = static_library('qos', libqos_srcs + genh,
+ name_suffix: 'fa',
+ build_by_default: false)
qos = declare_dependency(link_whole: libqos)
--
2.26.2
- [PULL 02/46] tests/Makefile: test-image-locking needs CONFIG_POSIX, (continued)
- [PULL 02/46] tests/Makefile: test-image-locking needs CONFIG_POSIX, Paolo Bonzini, 2020/09/04
- [PULL 01/46] qemu-iotests: move check-block back to Makefiles, Paolo Bonzini, 2020/09/04
- [PULL 08/46] meson: remove b_lundef option, Paolo Bonzini, 2020/09/04
- [PULL 06/46] mtest2make: hide output of successful tests, Paolo Bonzini, 2020/09/04
- [PULL 04/46] mtest2make: split environment from test command, Paolo Bonzini, 2020/09/04
- [PULL 09/46] configure: do not include absolute paths in -I and -L paths, Paolo Bonzini, 2020/09/04
- [PULL 16/46] meson: convert qht-bench, Paolo Bonzini, 2020/09/04
- [PULL 14/46] meson: declare tasn1 dependency, Paolo Bonzini, 2020/09/04
- [PULL 07/46] mtest2make: unify tests that appear in multiple suites, Paolo Bonzini, 2020/09/04
- [PULL 13/46] meson: build qapi tests library, Paolo Bonzini, 2020/09/04
- [PULL 12/46] meson: fix libqos linking,
Paolo Bonzini <=
- [PULL 10/46] configure: include cross sdl2-config in meson cross file, Paolo Bonzini, 2020/09/04
- [PULL 17/46] meson: convert the unit tests, Paolo Bonzini, 2020/09/04
- [PULL 20/46] meson: convert vhost-user-bridge, Paolo Bonzini, 2020/09/04
- [PULL 15/46] meson: declare keyutils dependency, Paolo Bonzini, 2020/09/04
- [PULL 05/46] mtest2make: split working directory from test command, Paolo Bonzini, 2020/09/04
- [PULL 03/46] tests: handling signal on win32 properly, Paolo Bonzini, 2020/09/04
- [PULL 11/46] ninjatool: use constant names for stamp files, Paolo Bonzini, 2020/09/04
- [PULL 18/46] meson: move keyutils dependency check, Paolo Bonzini, 2020/09/04
- [PULL 19/46] meson: remove old socket_scm_helper rule, Paolo Bonzini, 2020/09/04
- [PULL 21/46] meson: convert atomic*-bench, Paolo Bonzini, 2020/09/04