Commit Graph

3 Commits

Author SHA1 Message Date
Kai Kang
86af1a7d40 p11-kit: fix parallel build failures
It fails occasionally with missing generated header files:

| ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory
|    42 | #include "openssl.asn.h"
|       |          ^~~~~~~~~~~~~~~
| compilation terminated.

According to meson manual page:

https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly

'asn_h_dep' should be a dependency of static_library target 'libp11_asn1'
to make sure that required header files generated before compile
common/asn1.c.

(From OE-Core rev: 523ae4ba677ee9d9925182689b2d70af6d3df7a8)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-01-26 16:06:29 +00:00
Alexander Kanavin
c4f87eda9e p11-kit: upgrade 0.25.0 -> 0.25.2
Switch to gitsm:// to fetch https://github.com/p11-glue/pkcs11-json.git
as a submodule (otherwise meson will try to do that in do_configure).

(From OE-Core rev: 4331f57a45f144e6c156390d024c0e2d8bc9a991)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-11-30 08:43:04 +00:00
Ross Burton
48e174c386 p11-kit: fix build without qemu-usermode
If qemu-usermode is not available then p11-kit fails to configure:

  meson.build:313:24: ERROR: Can not run test applications in this cross environment.

This has already been fixed upstream, so backport the patches.

(From OE-Core rev: 3de715feaaaab9ac1e882a6913e2202203178170)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-08-21 11:34:12 +01:00