summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/p11-kit/files
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2024-01-22 12:24:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-26 16:06:29 +0000
commit86af1a7d4055181e0d419ad26f92949ea875380c (patch)
tree9cf7bb32d173c811e4637f907ec62df9673498cd /meta/recipes-support/p11-kit/files
parentdba0b9044663853f30621bad999420df4428d216 (diff)
downloadpoky-86af1a7d4055181e0d419ad26f92949ea875380c.tar.gz
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>
Diffstat (limited to 'meta/recipes-support/p11-kit/files')
-rw-r--r--meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch b/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
new file mode 100644
index 0000000000..47df027106
--- /dev/null
+++ b/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
@@ -0,0 +1,33 @@
1It fails occasionally with missing generated header files:
2
3| ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory
4| 42 | #include "openssl.asn.h"
5| | ^~~~~~~~~~~~~~~
6| compilation terminated.
7
8According to meson manual page:
9
10https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly
11
12'asn_h_dep' should be a dependency of static_library target 'libp11_asn1' to
13make sure that required header files generated before compile common/asn1.c.
14
15Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619]
16
17Signed-off-by: Kai Kang <kai.kang@windriver.com>
18---
19 common/meson.build | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/common/meson.build b/common/meson.build
23index dc86d7b..cc3ec48 100644
24--- a/common/meson.build
25+++ b/common/meson.build
26@@ -113,6 +113,7 @@ if with_asn1
27 'p11-asn1', libp11_asn1_sources,
28 gnu_symbol_visibility: 'hidden',
29 include_directories: configinc,
30+ dependencies: asn_h_dep,
31 )
32
33 libp11_asn1_dep = declare_dependency(