summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-09-14 15:22:36 +0200
committerGitHub <noreply@github.com>2018-09-14 15:22:36 +0200
commitd85e759e3b164acb2c2c28554c61c50e482252a6 (patch)
treea152c2f1b39317f07423bac81547dbc26a71f9bc
parentb252a30428b448b610edf59c0c0116a45039e4c8 (diff)
parent50ea1925fbb89c11f9a3e668ec69a37b5ea9de40 (diff)
downloadmeta-updater-d85e759e3b164acb2c2c28554c61c50e482252a6.tar.gz
Merge pull request #386 from advancedtelematic/fix/libp11-openssl1.1
libp11: Fix paths after switch to openssl 1.1.
-rw-r--r--recipes-support/libp11/libp11_0.4.9.bb (renamed from recipes-support/libp11/libp11_0.4.7.bb)10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.9.bb
index 02d9e50..6d0165f 100644
--- a/recipes-support/libp11/libp11_0.4.7.bb
+++ b/recipes-support/libp11/libp11_0.4.9.bb
@@ -11,14 +11,14 @@ RDEPENDS_${PN} += " opensc"
11 11
12SRC_URI = "git://github.com/OpenSC/libp11.git \ 12SRC_URI = "git://github.com/OpenSC/libp11.git \
13 file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch" 13 file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch"
14SRCREV = "da725ab727342083478150a203a3c80c4551feb4" 14SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
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"