aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-12-21 13:36:18 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-11 22:38:38 +0100
commit949045a4cb49ae056966ee76dd78bd524219d534 (patch)
treeeaff11edf62585f71c7efd7b4f98eab937443138
parentf6fae6744b004a712797a48ee699382a8c1ebf55 (diff)
downloadbuildroot-949045a4cb49ae056966ee76dd78bd524219d534.tar.gz
buildroot-949045a4cb49ae056966ee76dd78bd524219d534.tar.bz2
package/p11-kit: libtasn1 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 d82da39d55ea16c3c8aa3c5a8ea91fd6c2ceafbb) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/p11-kit/Config.in1
-rw-r--r--package/p11-kit/p11-kit.mk8
2 files changed, 7 insertions, 2 deletions
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
index 5690418756..9be76c2f41 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_LIBTASN1
help
Provides a way to load and enumerate PKCS#11 modules.
Provides a standard configuration setup for installing PKCS#11
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index fef4791831..c2a7b23e9d 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -6,7 +6,6 @@
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 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 \
@@ -27,4 +26,11 @@ else
P11_KIT_CONF_OPTS += --without-libffi
endif
+ifeq ($(BR2_PACKAGE_LIBTASN1),y)
+P11_KIT_DEPENDENCIES += host-pkgconf libtasn1
+P11_KIT_CONF_OPTS += --with-libtasn1
+else
+P11_KIT_CONF_OPTS += --without-libtasn1
+endif
+
$(eval $(autotools-package))