Re: [RFC PATCH v2 4/5] Revert "meson: Propagate gnutls dependency"

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 27/5/24 12:49, Paolo Bonzini wrote:
> From: Akihiko Odaki <akihiko.odaki@daynix.com>
> 
> This reverts commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2.
> 
> It was only needed because of duplicate objects caused by
> declare_dependency(link_whole: ...), and can be dropped now
> that meson.build specifies objects and dependencies separately
> for the internal dependencies.
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> Message-ID: <20240524-objects-v1-2-07cbbe96166b@daynix.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

> ---
>   meson.build                | 4 ++--
>   block/meson.build          | 2 +-
>   io/meson.build             | 2 +-
>   storage-daemon/meson.build | 2 +-
>   ui/meson.build             | 2 +-
>   5 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 9772c145bdb..84dbd7fb371 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3486,7 +3486,7 @@ if have_block
>       'blockdev-nbd.c',
>       'iothread.c',
>       'job-qmp.c',
> -  ), gnutls)
> +  ))
>   
>     # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
>     # os-win32.c does not
> @@ -4004,7 +4004,7 @@ if have_tools
>                dependencies: [block, qemuutil], install: true)
>     qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
>                  link_args: '@block.syms', link_depends: block_syms,
> -               dependencies: [blockdev, qemuutil, gnutls, selinux],
> +               dependencies: [blockdev, qemuutil, selinux],
>                  install: true)
>   
>     subdir('storage-daemon')
> diff --git a/block/meson.build b/block/meson.build
> index 158dc3b89db..f1262ec2ba8 100644
> --- a/block/meson.build
> +++ b/block/meson.build
> @@ -39,7 +39,7 @@ block_ss.add(files(
>     'throttle.c',
>     'throttle-groups.c',
>     'write-threshold.c',
> -), zstd, zlib, gnutls)
> +), zstd, zlib)
>   
>   system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
>   system_ss.add(files('block-ram-registrar.c'))
> diff --git a/io/meson.build b/io/meson.build
> index 283b9b2bdbd..1164812f912 100644
> --- a/io/meson.build
> +++ b/io/meson.build
> @@ -13,4 +13,4 @@ io_ss.add(files(
>     'dns-resolver.c',
>     'net-listener.c',
>     'task.c',
> -), gnutls)
> +))
> diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
> index fd5e32f4b28..5e61a9d1bdf 100644
> --- a/storage-daemon/meson.build
> +++ b/storage-daemon/meson.build
> @@ -1,6 +1,6 @@
>   qsd_ss = ss.source_set()
>   qsd_ss.add(files('qemu-storage-daemon.c'))
> -qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, gnutls)
> +qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil)
>   
>   subdir('qapi')
>   
> diff --git a/ui/meson.build b/ui/meson.build
> index cfbf29428df..28c7381dd10 100644
> --- a/ui/meson.build
> +++ b/ui/meson.build
> @@ -44,7 +44,7 @@ vnc_ss.add(files(
>     'vnc-jobs.c',
>     'vnc-clipboard.c',
>   ))
> -vnc_ss.add(zlib, jpeg, gnutls)
> +vnc_ss.add(zlib, jpeg)
>   vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
>   system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss)
>   system_ss.add(when: vnc, if_false: files('vnc-stubs.c'))