[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/12] meson: Add static glib dependency for initrd-stress.img
|
From: |
Paolo Bonzini |
|
Subject: |
[PULL 06/12] meson: Add static glib dependency for initrd-stress.img |
|
Date: |
Fri, 26 May 2023 18:08:18 +0200 |
From: Fabiano Rosas <farosas@suse.de>
We recently moved glib detection code to meson but this changes the
linker command line from -lglib-2.0 to using a path to libglib-2.0.so.
This does not work for static linking, which is used by stress.c:
$ make V=1 tests/migration/initrd-stress.img
cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group
/usr/lib64/libglib-2.0.so -Wl,--end-group
...
bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so'
Add a specific dependency for stress.c, which is linked statically.
The compiler command line is now:
cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread
-Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group
Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson")
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20230525212044.30222-3-farosas@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/migration/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/migration/meson.build b/tests/migration/meson.build
index dd562355a16e..ac71f1329014 100644
--- a/tests/migration/meson.build
+++ b/tests/migration/meson.build
@@ -1,9 +1,11 @@
sysprof = dependency('sysprof-capture-4', required: false)
+glib_static = dependency('glib-2.0', version: glib_req_ver, required: false,
+ method: 'pkg-config', static: true)
stress = executable(
'stress',
files('stress.c'),
- dependencies: [glib, sysprof],
+ dependencies: [glib_static, sysprof],
link_args: ['-static'],
build_by_default: false,
)
--
2.40.1
- Re: [PULL 04/12] configure: unset harmful environment variables, (continued)
- [PULL 08/12] virtio: qmp: fix memory leak, Paolo Bonzini, 2023/05/26
- [PULL 05/12] meson: Remove leftover comment, Paolo Bonzini, 2023/05/26
- [PULL 07/12] slirp: update wrap to latest master, Paolo Bonzini, 2023/05/26
- [PULL 09/12] meson: simplify logic for -Dfdt, Paolo Bonzini, 2023/05/26
- [PULL 10/12] meson: use subproject for internal libfdt, Paolo Bonzini, 2023/05/26
- [PULL 11/12] meson: use subproject for keycodemapdb, Paolo Bonzini, 2023/05/26
- [PULL 12/12] configure: ignore --make, Paolo Bonzini, 2023/05/26
- [PULL 06/12] meson: Add static glib dependency for initrd-stress.img,
Paolo Bonzini <=
- Re: [PULL 00/12] (Mostly) build system patches for 2023-05-26, Richard Henderson, 2023/05/26