summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-02 18:54:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-04 12:30:58 +0000
commit6c2d399220dd1e7d6b69e653a066205c60e38ed5 (patch)
tree798e7cc9c37ff6c0d0e3253b0f17bacf3052599e /meta
parent991e2b5879c43ffb384530fe01639004df872206 (diff)
downloadpoky-6c2d399220dd1e7d6b69e653a066205c60e38ed5.tar.gz
p11-kit: convert to meson
Add libtasn-native dependency as meson builds need asn1Parser executable. (From OE-Core rev: 3d80c598b0677e84c493ff1a928653ded843e0ba) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb32
1 files changed, 7 insertions, 25 deletions
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
index 9193a06ea8..03c8158ae6 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
@@ -2,38 +2,20 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules"
2LICENSE = "BSD-3-Clause" 2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" 3LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50"
4 4
5inherit autotools gettext pkgconfig gtk-doc 5inherit meson gettext pkgconfig gtk-doc
6 6
7DEPENDS = "libtasn1 libffi" 7DEPENDS = "libtasn1 libtasn1-native libffi"
8
9DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
8 10
9SRC_URI = "git://github.com/p11-glue/p11-kit" 11SRC_URI = "git://github.com/p11-glue/p11-kit"
10SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" 12SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
11S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
12 14
13AUTOTOOLS_AUXDIR = "${S}/build/litter"
14
15PACKAGECONFIG ??= "" 15PACKAGECONFIG ??= ""
16PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" 16PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates"
17 17
18# This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags 18GTKDOC_MESON_OPTION = 'gtk_doc'
19# that control gtk-doc build are non-standard
20EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-doc --enable-doc-html --disable-doc-pdf', \
21 '--disable-doc', d)} "
22
23# When building native recipes, disable gtkdoc, as it is not necessary,
24# pulls in additional dependencies, and makes build times longer
25EXTRA_OECONF_prepend_class-native = "--disable-doc "
26EXTRA_OECONF_prepend_class-nativesdk = "--disable-doc "
27
28UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-gtk-doc-html --disable-gtk-doc-pdf --enable-gtk-doc --disable-gtk-doc"
29
30# p11-kit relies on these two being copied from source tree
31# instead of being regenerated by gtkdoc-scan, but doesn't setup
32# dependencies correctly when there is a parallel build. Let's pre-copy
33# them instead.
34do_compile_prepend () {
35 cp ${S}/doc/manual/p11-kit-overrides.txt ${S}/doc/manual/p11-kit-sections.txt ${B}/doc/manual/
36}
37 19
38FILES_${PN} += " \ 20FILES_${PN} += " \
39 ${libdir}/p11-kit-proxy.so \ 21 ${libdir}/p11-kit-proxy.so \