summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-09-14 11:58:20 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-09-21 14:01:10 +0200
commit8a62b2d42405601e47bf5667953d5d140da2f6b5 (patch)
tree11ca87b3533f4c2a623cc6e105ac75c269966548
parentfd66047f721dee191a68163c3dd75c7d6aa253b1 (diff)
downloadmeta-updater-8a62b2d42405601e47bf5667953d5d140da2f6b5.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.bb8
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"
18inherit autotools pkgconfig 18inherit 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
23PARALLEL_MAKE = "" 23PARALLEL_MAKE = ""
24EXTRA_OECONF = "--disable-static" 24EXTRA_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
31FILES_${PN} = "${libdir}/engines/pkcs11.so \ 31FILES_${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
35FILES_${PN}-dev = " \ 35FILES_${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"