| Message ID | 168471463402.18155.3575359027429939965-1@git.sr.ht (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add conditional dependency for libkeyutils | expand |
Hi! On 22/05/2023 02.12, ~_6d6178667269747a wrote: There is something weird with your setup (sender name is "~_6d6178667269747a" ?) > 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 > > has_gettid = cc.has_function('gettid') Please put the maintainer for the crypto/ folder for this into copy (done now). Thomas
On Mon, May 22, 2023 at 02:12:02AM +0200, ~_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(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
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
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 has_gettid = cc.has_function('gettid')