aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-12-21 13:36:17 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-11 22:38:33 +0100
commitf6fae6744b004a712797a48ee699382a8c1ebf55 (patch)
tree69208dcab32bc151097d2fb58802c034446dd97c
parent144c1afa571c491f6ab9426d3e2f8ec6dbfd2b7e (diff)
downloadbuildroot-f6fae6744b004a712797a48ee699382a8c1ebf55.tar.gz
buildroot-f6fae6744b004a712797a48ee699382a8c1ebf55.tar.bz2
package/p11-kit: libffi is optional, not mandatory
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 10a2fcc81eb6fedd83849b5ece7c6f7b220f465f) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/p11-kit/Config.in1
-rw-r--r--package/p11-kit/p11-kit.mk9
2 files changed, 8 insertions, 2 deletions
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
index a6b7261886..5690418756 100644
--- a/package/p11-kit/Config.in
+++ b/package/p11-kit/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_P11_KIT
depends on !BR2_STATIC_LIBS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_THREADS
- select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_LIBTASN1
help
Provides a way to load and enumerate PKCS#11 modules.
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index 1f72e0515b..fef4791831 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -6,7 +6,7 @@
P11_KIT_VERSION = 0.23.16.1
P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)
-P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1
+P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
P11_KIT_INSTALL_STAGING = YES
P11_KIT_CONF_OPTS = --disable-static
P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
@@ -20,4 +20,11 @@ else
P11_KIT_CONF_OPTS += --without-trust-paths
endif
+ifeq ($(BR2_PACKAGE_LIBFFI),y)
+P11_KIT_DEPENDENCIES += host-pkgconf libffi
+P11_KIT_CONF_OPTS += --with-libffi
+else
+P11_KIT_CONF_OPTS += --without-libffi
+endif
+
$(eval $(autotools-package))