summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2019-04-17 11:49:33 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-04-18 15:51:51 +0200
commitda22b723bfa2d0ec0c2b61c696d06b05849bb818 (patch)
tree24a327fb5978441b380354bcab14c8f4ec6840a2
parentec7324dfe49aa3ebedc714d984330246ac54dd27 (diff)
downloadptxdist-da22b723bfa2d0ec0c2b61c696d06b05849bb818.tar.gz
ptxdist-da22b723bfa2d0ec0c2b61c696d06b05849bb818.tar.xz
libp11: update engines directroy for openssl 1.1
Openssl 1.1 changes the default engines search directory to /usr/lib/engines-1.1, change libp11 accordingly. Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/libp11.make6
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/libp11.make b/rules/libp11.make
index 6a7c39e69..37eb8b60b 100644
--- a/rules/libp11.make
+++ b/rules/libp11.make
@@ -34,7 +34,7 @@ LIBP11_CONF_OPT := \
--disable-strict \
--disable-pedantic \
--disable-api-doc \
- --with-enginesdir=/usr/lib/engines \
+ --with-enginesdir=/usr/lib/engines-1.1 \
--with-pkcs11-module=$(call ptx/ifdef,PTXCONF_LIBP11_PROXY_MODULE,p11-kit-proxy.so)
$(STATEDIR)/libp11.targetinstall:
@@ -48,10 +48,10 @@ $(STATEDIR)/libp11.targetinstall:
@$(call install_lib, libp11, 0, 0, 0644, libp11)
@$(call install_copy, libp11, 0, 0, 0644, -, \
- /usr/lib/engines/pkcs11.so)
+ /usr/lib/engines-1.1/pkcs11.so)
@$(call install_link, libp11, pkcs11.so, \
- /usr/lib/engines/libpkcs11.so)
+ /usr/lib/engines-1.1/libpkcs11.so)
@$(call install_finish, libp11)