summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-23 12:43:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:35 +0100
commitb05eda5fc83f720f20f28a41a8de73cc135a5272 (patch)
treeac3d5ccf3431f683f9740dc6ae028dadf99b0ed1
parent99eff38c6e2c8f263a8bf8a7207a286a7c382064 (diff)
downloadpoky-b05eda5fc83f720f20f28a41a8de73cc135a5272.tar.gz
gnutls: fix libidn dependencies
gnutls only works with libidn2, so update the build dependency. (From OE-Core rev: d2397d1fbe97eb92ff9aeb03155f98e24e95c97d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index b62a137e59..876a3847b0 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -25,10 +25,8 @@ PACKAGECONFIG ??= "libidn"
25 25
26# You must also have CONFIG_SECCOMP enabled in the kernel for 26# You must also have CONFIG_SECCOMP enabled in the kernel for
27# seccomp to work. 27# seccomp to work.
28#
29PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" 28PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp"
30 29PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2"
31PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
32PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" 30PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1"
33PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" 31PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit"
34PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" 32PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"