qemu-stable
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stable-8.2.2 59/60] meson: Explicitly specify dbus-display1.h dependenc


From: Michael Tokarev
Subject: [Stable-8.2.2 59/60] meson: Explicitly specify dbus-display1.h dependency
Date: Wed, 21 Feb 2024 11:20:47 +0300

From: Akihiko Odaki <akihiko.odaki@daynix.com>

Explicitly specify dbus-display1.h as a dependency so that files
depending on it will not get compiled too early.

Fixes: 1222070e7728 ("meson: ensure dbus-display generated code is built before 
other units")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20240214-dbus-v7-2-7eff29f04c34@daynix.com>
(cherry picked from commit 7aee57df930da2cf6361c5183aff96468ae4027d)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/ui/meson.build b/ui/meson.build
index 0ccb3387ee..0f09d31c60 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -92,7 +92,7 @@ if dbus_display
                                           '--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, 
include_directories: include_directories('.'))
+  dbus_display1_dep = declare_dependency(link_with: dbus_display1_lib, 
sources: dbus_display1[0])
   dbus_ss.add(when: [gio, dbus_display1_dep],
               if_true: [files(
                 'dbus-chardev.c',
-- 
2.39.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]