diff options
Diffstat (limited to 'meta/recipes-support/p11-kit')
-rw-r--r-- | meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch | 33 | ||||
-rw-r--r-- | meta/recipes-support/p11-kit/p11-kit_0.25.3.bb (renamed from meta/recipes-support/p11-kit/p11-kit_0.23.22.bb) | 16 |
2 files changed, 43 insertions, 6 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 @@ | |||
1 | It 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 | |||
8 | According to meson manual page: | ||
9 | |||
10 | https://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 | ||
13 | make sure that required header files generated before compile common/asn1.c. | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619] | ||
16 | |||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
18 | --- | ||
19 | common/meson.build | 1 + | ||
20 | 1 file changed, 1 insertion(+) | ||
21 | |||
22 | diff --git a/common/meson.build b/common/meson.build | ||
23 | index 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( | ||
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb index c539ecdbc6..b7ebd44abc 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.22.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb | |||
@@ -1,4 +1,6 @@ | |||
1 | SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" | 1 | SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" |
2 | DESCRIPTION = " Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. Also solves problems with coordinating the use of PKCS#11 by different components or libraries living in the same process." | ||
3 | HOMEPAGE = "https://p11-glue.github.io/p11-glue/p11-kit.html" | ||
2 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" |
4 | 6 | ||
@@ -6,10 +8,12 @@ inherit meson gettext pkgconfig gtk-doc bash-completion manpages | |||
6 | 8 | ||
7 | DEPENDS = "libtasn1 libtasn1-native libffi" | 9 | DEPENDS = "libtasn1 libtasn1-native libffi" |
8 | 10 | ||
9 | DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" | 11 | DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" |
10 | 12 | ||
11 | SRC_URI = "git://github.com/p11-glue/p11-kit;branch=0.23" | 13 | SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \ |
12 | SRCREV = "bd97afbfe28d5fbbde95ce36ff7a8834fc0291ee" | 14 | file://fix-parallel-build-failures.patch \ |
15 | " | ||
16 | SRCREV = "917e02a3211dabbdea4b079cb598581dce84fda1" | ||
13 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
14 | 18 | ||
15 | PACKAGECONFIG ??= "" | 19 | PACKAGECONFIG ??= "" |
@@ -18,13 +22,13 @@ PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,, | |||
18 | 22 | ||
19 | GTKDOC_MESON_OPTION = 'gtk_doc' | 23 | GTKDOC_MESON_OPTION = 'gtk_doc' |
20 | 24 | ||
21 | FILES_${PN} += " \ | 25 | FILES:${PN} += " \ |
22 | ${libdir}/p11-kit-proxy.so \ | 26 | ${libdir}/p11-kit-proxy.so \ |
23 | ${libdir}/pkcs11/*.so \ | 27 | ${libdir}/pkcs11/*.so \ |
24 | ${libdir}/pkcs11/*.la \ | 28 | ${libdir}/pkcs11/*.la \ |
25 | ${systemd_user_unitdir}/*" | 29 | ${systemd_user_unitdir}/*" |
26 | 30 | ||
27 | # PN contains p11-kit-proxy.so, a symlink to a loadable module | 31 | # PN contains p11-kit-proxy.so, a symlink to a loadable module |
28 | INSANE_SKIP_${PN} = "dev-so" | 32 | INSANE_SKIP:${PN} = "dev-so" |
29 | 33 | ||
30 | BBCLASSEXTEND = "nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |