Re: [PATCH qemu 1/1] [meson.build] Add conditional dependency for libkeyutils

From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Max Fritz <antischmock@googlemail.com>
Cc: "Daniel P. Berrange" <berrange@redhat.com>
Subject: Re: [PATCH qemu 1/1] [meson.build] Add conditional dependency for libkeyutils
Date: Wed, 31 May 2023 15:09:43 +0200	[thread overview]
Message-ID: <d1649124-9c28-b779-41dc-ec77739828b6@redhat.com> (raw)
In-Reply-To: <168471463402.18155.3575359027429939965-1@git.sr.ht>

On 22/05/2023 02.12, ~_6d6178667269747a wrote:
> From: Max Fritz <antischmock@googlemail.com>
> 
> This modification enables better control over the inclusion of libkeyutils
> based on the configuration, enhancing the flexibility of the build system.
> 
> Signed-off-by: Max Fritz <antischmock@googlemail.com>
> ---
>   meson.build | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 0a5cdefd4d..206d4033bf 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1764,8 +1764,11 @@ if gnutls.found()
>     tasn1 = dependency('libtasn1',
>                        method: 'pkg-config')
>   endif
> -keyutils = dependency('libkeyutils', required: false,
> -                      method: 'pkg-config')
> +keyutils = not_found
> +if get_option('keyring').enabled()
> +  keyutils = dependency('libkeyutils', required: false,
> +                        method: 'pkg-config', kwargs: static_kwargs)
> +endif

FYI, since nobody else picked this up yet, I'll add this to my next pull 
request (dropping the "kwargs" part from the patch, AFAIK it's not needed 
anymore, see commit 063d5119c18af76).

  Thomas