From 945071cc31280d3bd164478b50e2970b6a42fd02 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 6 Sep 2023 19:14:19 +0100 Subject: [PATCH] libsoup: update PACKAGECONFIG Add explicit PACKAGECONFIGs for brotli,ntlm, and sysprof. libsoup needs to be told where ntlm_auth will be on the target, so write a cross file to do so. Also explicitly disable more of the test suites as we don't build them yet. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/libsoup/libsoup_3.4.2.bb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/libsoup/libsoup_3.4.2.bb b/meta/recipes-support/libsoup/libsoup_3.4.2.bb index 37e54abe733..ad86c890a12 100644 --- a/meta/recipes-support/libsoup/libsoup_3.4.2.bb +++ b/meta/recipes-support/libsoup/libsoup_3.4.2.bb @@ -24,11 +24,24 @@ inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection g GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. PACKAGECONFIG ??= "" +PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli" PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" - -EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false" +PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled" +PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof" + +# Tell libsoup where the target ntlm_auth is installed +do_write_config:append:class-target() { + cat >${WORKDIR}/soup.cross <