mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-21 10:24:33 +00:00
ui: compile dbus-display1.c with -fPIC as necessary
Building dbus-display1.c explicitly as a static library drops -fPIC by default, which may not be correct if it ends up linked to a shared library. Let the target decide how to build the unit, with or without -fPIC. This makes commit186acfbaf7
("tests/qtest: Depend on dbus_display1_dep") no longer relevant, as dbus-display1.c will be recompiled. Fixes:c172136ea3
("meson: ensure dbus-display generated code is built before other units") Reported-by: Olaf Hering <olaf@aepfle.de> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
parent
e99441a379
commit
d4069a84a3
|
@ -90,8 +90,7 @@ if dbus_display
|
|||
'--interface-prefix', 'org.qemu.',
|
||||
'--c-namespace', 'QemuDBus',
|
||||
'--generate-c-code', '@BASENAME@'])
|
||||
dbus_display1_lib = static_library('dbus-display1', dbus_display1, dependencies: gio)
|
||||
dbus_display1_dep = declare_dependency(link_with: dbus_display1_lib, sources: dbus_display1[0])
|
||||
dbus_display1_dep = declare_dependency(sources: dbus_display1, dependencies: gio)
|
||||
dbus_ss.add(when: [gio, dbus_display1_dep],
|
||||
if_true: [files(
|
||||
'dbus-chardev.c',
|
||||
|
|
Loading…
Reference in a new issue