diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-02 18:54:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-04 12:29:29 +0000 |
| commit | 3d80c598b0677e84c493ff1a928653ded843e0ba (patch) | |
| tree | c47bc5f0c54b03ee33483357c69e3e49236d06b8 | |
| parent | 9aab37ac40c8da5121a931f5979fcc88489021d2 (diff) | |
| download | openembedded-core-contrib-3d80c598b0677e84c493ff1a928653ded843e0ba.tar.gz | |
p11-kit: convert to meson
Add libtasn-native dependency as meson builds need asn1Parser executable.
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>
| -rw-r--r-- | meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | 32 |
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" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit autotools gettext pkgconfig gtk-doc +inherit meson gettext pkgconfig gtk-doc -DEPENDS = "libtasn1 libffi" +DEPENDS = "libtasn1 libtasn1-native libffi" + +DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" S = "${WORKDIR}/git" -AUTOTOOLS_AUXDIR = "${S}/build/litter" - PACKAGECONFIG ??= "" -PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" - -# This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags -# that control gtk-doc build are non-standard -EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-doc --enable-doc-html --disable-doc-pdf', \ - '--disable-doc', d)} " - -# When building native recipes, disable gtkdoc, as it is not necessary, -# pulls in additional dependencies, and makes build times longer -EXTRA_OECONF_prepend_class-native = "--disable-doc " -EXTRA_OECONF_prepend_class-nativesdk = "--disable-doc " - -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-gtk-doc-html --disable-gtk-doc-pdf --enable-gtk-doc --disable-gtk-doc" - -# p11-kit relies on these two being copied from source tree -# instead of being regenerated by gtkdoc-scan, but doesn't setup -# dependencies correctly when there is a parallel build. Let's pre-copy -# them instead. -do_compile_prepend () { - cp ${S}/doc/manual/p11-kit-overrides.txt ${S}/doc/manual/p11-kit-sections.txt ${B}/doc/manual/ -} +PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" + +GTKDOC_MESON_OPTION = 'gtk_doc' FILES_${PN} += " \ ${libdir}/p11-kit-proxy.so \ |