1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00

p11-kit: update 0.25.3 -> 0.25.5

(From OE-Core rev: f7b3e0d91d68459e45f57338ca5a4b85219824cd)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-08-27 07:23:42 +02:00
committed by Richard Purdie
parent b773b1ca8a
commit 102b9a09df
2 changed files with 1 additions and 35 deletions
@@ -1,33 +0,0 @@
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.
Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
common/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/meson.build b/common/meson.build
index dc86d7b..cc3ec48 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -113,6 +113,7 @@ if with_asn1
'p11-asn1', libp11_asn1_sources,
gnu_symbol_visibility: 'hidden',
include_directories: configinc,
+ dependencies: asn_h_dep,
)
libp11_asn1_dep = declare_dependency(
@@ -11,9 +11,8 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \
file://fix-parallel-build-failures.patch \
"
SRCREV = "917e02a3211dabbdea4b079cb598581dce84fda1"
SRCREV = "0dd113361057e477f40ff4d8788f3e7e400af5f9"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= ""