mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-04 22:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

p11-kit: fix parallel build failures

Browse Source 
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>
This commit is contained in:
Kai Kang
2024-01-22 12:24:00 +08:00
committed by Richard Purdie
parent dba0b90446
commit 86af1a7d40
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch Normal file
View File

@@ -0,0 +1,33 @@
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(

4
meta/recipes-support/p11-kit/p11-kit_0.25.3.bb
View File

@@ -10,7 +10,9 @@ 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"
SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \
file://fix-parallel-build-failures.patch \
"
SRCREV = "917e02a3211dabbdea4b079cb598581dce84fda1"
S = "${WORKDIR}/git"