From d66f0c0b62c407f2723c31b19469d29522ae968a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Oct 2021 23:55:21 +0200 Subject: [PATCH] package/softhsm2: add p11-kit optional dependency p11-kit is an optional dependency which is enabled by default since the addition of the package in commit 53873b6daecd2a97740833cae7c5b4cdb185a6b2 and softhsm2 needs help to properly install files: /usr/bin/install -c -m 644 softhsm2.module '/home/buildroot/autobuild/instance-0/output-1/host/nios2-buildroot-linux-gnu/sysroot/home/buildroot/autobuild/instance-0/output-1/host/bin/../nios2-buildroot-linux-gnu/sysroot/usr/share/p11-kit/modules' [...] softhsm2: installs files in /home/buildroot/autobuild/instance-0/output-1/host/nios2-buildroot-linux-gnu/sysroot//home/buildroot/autobuild/instance-0/output-1 package/pkg-generic.mk:330: recipe for target '/home/buildroot/autobuild/instance-0/output-1/build/softhsm2-2.6.1/.stamp_staging_installed' failed Fixes: - http://autobuild.buildroot.org/results/a05bb71cfe016f793c89b2a035835718836039c8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/softhsm2/softhsm2.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/softhsm2/softhsm2.mk b/package/softhsm2/softhsm2.mk index c418e3648e..5e37e42dde 100644 --- a/package/softhsm2/softhsm2.mk +++ b/package/softhsm2/softhsm2.mk @@ -12,4 +12,13 @@ SOFTHSM2_LICENSE_FILES = LICENSE SOFTHSM2_DEPENDENCIES = openssl SOFTHSM2_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_P11_KIT),y) +SOFTHSM2_CONF_OPTS += \ + --enable-p11-kit \ + --with-p11-kit=/usr/share/p11-kit/modules +SOFTHSM2_DEPENDENCIES += p11-kit +else +SOFTHSM2_CONF_OPTS += --disable-p11-kit +endif + $(eval $(autotools-package))