Attachment 248143 Details for Bug 276787 – patch works

[patch] patch works

patches.devel.libvirt.diff (text/plain), 2.36 KB, created by Dan Langille on 2024-02-02 22:40:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2024-02-02 22:40:57 UTC

Size: 2.36 KB

patch

obsolete

>po/meson.build         |  1 +
> src/meson.build        |  6 +++++-
> src/remote/meson.build | 15 +++++++++++----
> 3 files changed, 17 insertions(+), 5 deletions(-)
>
>diff --git a/po/meson.build b/po/meson.build
>index a20877ad34..592b254447 100644
>--- a/po/meson.build
>+++ b/po/meson.build
>@@ -20,6 +20,7 @@ potfiles_dep = [
>   access_gen_sources,
>   admin_client_generated,
>   admin_driver_generated,
>+  remote_protocol_generated,
>   remote_driver_generated,
>   remote_daemon_generated,
> ]
>diff --git a/src/meson.build b/src/meson.build
>index 6538c43628..f52d2d5994 100644
>--- a/src/meson.build
>+++ b/src/meson.build
>@@ -616,7 +616,11 @@ foreach daemon : virt_daemons
>   bin = executable(
>     daemon['name'],
>     [
>-      daemon.get('sources', [ remote_daemon_sources, remote_daemon_generated ]),
>+      daemon.get('sources', [
>+        remote_protocol_generated,
>+        remote_daemon_sources,
>+        remote_daemon_generated
>+      ]),
>       dtrace_gen_objects,
>     ],
>     c_args: [
>diff --git a/src/remote/meson.build b/src/remote/meson.build
>index 681c709823..831acaaa01 100644
>--- a/src/remote/meson.build
>+++ b/src/remote/meson.build
>@@ -7,8 +7,6 @@ remote_driver_generated = []
> 
> foreach name : [ 'remote', 'qemu', 'lxc' ]
>   client_bodies_h = '@0@_client_bodies.h'.format(name)
>-  protocol_c = '@0@_protocol.c'.format(name)
>-  protocol_h = '@0@_protocol.h'.format(name)
>   protocol_x = '@0@_protocol.x'.format(name)
> 
>   remote_driver_generated += custom_target(
>@@ -20,8 +18,16 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
>     ],
>     capture: true,
>   )
>+endforeach
> 
>-  remote_driver_generated += custom_target(
>+remote_protocol_generated = []
>+
>+foreach name : [ 'remote', 'qemu', 'lxc' ]
>+  protocol_c = '@0@_protocol.c'.format(name)
>+  protocol_h = '@0@_protocol.h'.format(name)
>+  protocol_x = '@0@_protocol.x'.format(name)
>+
>+  remote_protocol_generated += custom_target(
>     protocol_h,
>     input: protocol_x,
>     output: protocol_h,
>@@ -32,7 +38,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
>     ],
>   )
> 
>-  remote_driver_generated += custom_target(
>+  remote_protocol_generated += custom_target(
>     protocol_c,
>     input: protocol_x,
>     output: protocol_c,
>@@ -143,6 +149,7 @@ if conf.has('WITH_REMOTE')
>   remote_driver_lib = static_library(
>     'virt_remote_driver',
>     [
>+      remote_protocol_generated,
>       remote_driver_sources,
>       remote_driver_generated,
>     ],

Actions: View | Diff

Attachments on bug 276787: 248143