Re: [OE-core] [PATCH 09/11] p11-kit: convert to meson

2019-11-25 Thread Alexander Kanavin 
On Sun, 24 Nov 2019 at 00:04, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

> On Wed, 2019-11-20 at 14:44 +0100, Alexander Kanavin wrote:
> > Signed-off-by: Alexander Kanavin 
> > ---
> >  .../p11-kit/p11-kit_0.23.18.1.bb  | 26 +++
> > 
> >  1 file changed, 3 insertions(+), 23 deletions(-)
>
> I think this caused a failure on the autobuilder:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/1268
>

Thanks, will fix and resend.

Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 09/11] p11-kit: convert to meson

2019-11-23 Thread Richard Purdie 
On Wed, 2019-11-20 at 14:44 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin 
> ---
>  .../p11-kit/p11-kit_0.23.18.1.bb  | 26 +++
> 
>  1 file changed, 3 insertions(+), 23 deletions(-)

I think this caused a failure on the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/1268

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 09/11] p11-kit: convert to meson

2019-11-20 Thread Alexander Kanavin 
Signed-off-by: Alexander Kanavin 
---
 .../p11-kit/p11-kit_0.23.18.1.bb  | 26 +++
 1 file changed, 3 insertions(+), 23 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..dbf8fa2c468 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,7 +2,7 @@ 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"
 
@@ -10,30 +10,10 @@ 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"
+PACKAGECONFIG[trust-paths] = 
"-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates"
 
-# 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/
-}
+GTKDOC_MESON_OPTION = 'gtk_doc'
 
 FILES_${PN} += " \
 ${libdir}/p11-kit-proxy.so \
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core