summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-09-06 19:14:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-07 14:36:30 +0100
commitbd07b05d6e20ea7e574876ef832984d280984b7c (patch)
tree6ae07ec2583a2a755863af1becea7f0b3a8546f8
parenta3d8123f9e89828322bf5dedb57487d8ae1d98ce (diff)
downloadpoky-bd07b05d6e20ea7e574876ef832984d280984b7c.tar.gz
libsoup-2.4: 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. (From OE-Core rev: 54b6ea078daeb58a3bb20bb4275d1140640a77d2) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb18
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
index 79281fbf5b..5abeced30b 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
@@ -25,12 +25,24 @@ UPSTREAM_CHECK_REGEX = "libsoup-(?P<pver>2(\.(?!99)\d+)+)\.tar"
25GIR_MESON_ENABLE_FLAG = 'enabled' 25GIR_MESON_ENABLE_FLAG = 'enabled'
26GIR_MESON_DISABLE_FLAG = 'disabled' 26GIR_MESON_DISABLE_FLAG = 'disabled'
27 27
28# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default.
29PACKAGECONFIG ??= "" 28PACKAGECONFIG ??= ""
29PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli"
30# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards
30PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" 31PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false"
31PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" 32PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5"
32 33PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled"
33EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false" 34PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof"
35
36# Tell libsoup where the target ntlm_auth is installed
37do_write_config:append:class-target() {
38 cat >${WORKDIR}/soup.cross <<EOF
39[binaries]
40ntlm_auth = '${bindir}/ntlm_auth'
41EOF
42}
43EXTRA_OEMESON += "--cross-file ${WORKDIR}/soup.cross"
44
45EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false"
34 46
35GTKDOC_MESON_OPTION = "gtk_doc" 47GTKDOC_MESON_OPTION = "gtk_doc"
36 48