diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-09-14 11:58:20 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-09-14 13:53:29 +0200 |
commit | 3e86310a64a769622ea8066c967bf0bad6be70e7 (patch) | |
tree | d58a7b9e49ef8913350368883b910c155e973d6b | |
parent | b252a30428b448b610edf59c0c0116a45039e4c8 (diff) | |
download | meta-updater-3e86310a64a769622ea8066c967bf0bad6be70e7.tar.gz |
libp11: Fix paths after switch to openssl 1.1.
It should now accept paths in either format to accommodate openssl
versions 1.0 and 1.1.
-rw-r--r-- | recipes-support/libp11/libp11_0.4.7.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb index 02d9e50..00074e5 100644 --- a/recipes-support/libp11/libp11_0.4.7.bb +++ b/recipes-support/libp11/libp11_0.4.7.bb | |||
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git" | |||
18 | inherit autotools pkgconfig | 18 | inherit autotools pkgconfig |
19 | 19 | ||
20 | # Currently, Makefile dependencies are incorrectly defined which causes build errors | 20 | # Currently, Makefile dependencies are incorrectly defined which causes build errors |
21 | # The number of jobs is high | 21 | # if the number of jobs is high |
22 | # See https://github.com/OpenSC/libp11/issues/94 | 22 | # See https://github.com/OpenSC/libp11/issues/94 |
23 | PARALLEL_MAKE = "" | 23 | PARALLEL_MAKE = "" |
24 | EXTRA_OECONF = "--disable-static" | 24 | EXTRA_OECONF = "--disable-static" |
@@ -28,12 +28,12 @@ do_install_append () { | |||
28 | rm -rf ${D}${docdir}/${BPN} | 28 | rm -rf ${D}${docdir}/${BPN} |
29 | } | 29 | } |
30 | 30 | ||
31 | FILES_${PN} = "${libdir}/engines/pkcs11.so \ | 31 | FILES_${PN} = "${libdir}/engines*/pkcs11.so \ |
32 | ${libdir}/engines/libpkcs11${SOLIBS} \ | 32 | ${libdir}/engines*/libpkcs11${SOLIBS} \ |
33 | ${libdir}/libp11${SOLIBS}" | 33 | ${libdir}/libp11${SOLIBS}" |
34 | 34 | ||
35 | FILES_${PN}-dev = " \ | 35 | FILES_${PN}-dev = " \ |
36 | ${libdir}/engines/libpkcs11${SOLIBSDEV} \ | 36 | ${libdir}/engines*/libpkcs11${SOLIBSDEV} \ |
37 | ${libdir}/libp11${SOLIBSDEV} \ | 37 | ${libdir}/libp11${SOLIBSDEV} \ |
38 | ${libdir}/pkgconfig/libp11.pc \ | 38 | ${libdir}/pkgconfig/libp11.pc \ |
39 | /usr/include" | 39 | /usr/include" |