From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 05/18] p11-kit: convert to meson
Date: Mon, 2 Dec 2019 18:54:46 +0100 [thread overview]
Message-ID: <20191202175459.112655-5-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20191202175459.112655-1-alex.kanavin@gmail.com>
Add libtasn-native dependency as meson builds need asn1Parser executable.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../p11-kit/p11-kit_0.23.18.1.bb | 32 ++++---------------
1 file 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 9193a06ea80..03c8158ae62 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 \
--
2.17.1
next prev parent reply other threads:[~2019-12-02 17:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 17:54 [PATCH 01/18] rpm: upgrade to 4.15.1 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 02/18] gettext-minimal-native: update to 0.20.1 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 03/18] gettext: " Alexander Kanavin
2019-12-02 17:54 ` [PATCH 04/18] lrzsz: fix issues with newer versions of gettext Alexander Kanavin
2019-12-02 17:54 ` Alexander Kanavin [this message]
2019-12-02 17:54 ` [PATCH 06/18] psmisc: revert to default autopoint exclusion Alexander Kanavin
2019-12-02 17:54 ` [PATCH 07/18] sed: upgrade to 4.7 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 08/18] bind: update 9.11.5-P4 -> 9.11.13 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 09/18] flex: update to 2.6.4 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 10/18] gettext: fix failing ptests Alexander Kanavin
2019-12-02 17:54 ` [PATCH 11/18] libffi: update to 3.3 final Alexander Kanavin
2019-12-02 17:54 ` [PATCH 12/18] libcomps: update to 0.1.12 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 13/18] python3: update to 3.8.0 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 14/18] openssh: update to 8.1p1 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 15/18] gtk+3: update to 3.24.13 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 16/18] selftest: skip virgl gtk/sdl test on opensuse 15.0 Alexander Kanavin
2019-12-02 17:54 ` [PATCH 17/18] gstreamer1.0-python: switch to meson Alexander Kanavin
2019-12-02 17:54 ` [PATCH 18/18] gstreamer1.0-python: add a patch to fix python 3.8 builds Alexander Kanavin
2019-12-02 18:02 ` ✗ patchtest: failure for "rpm: upgrade to 4.15.1..." and 17 more Patchwork
2019-12-02 22:46 ` [PATCH 01/18] rpm: upgrade to 4.15.1 akuster808
2019-12-03 11:13 ` Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191202175459.112655-5-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox