Skip to contentSkip to conversation

package/p11-kit: libffi is optional, not mandatory

PATCH New Fabrice Fontaine 2 participants 3 messages Dec 21, 2020 – Dec 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 package/p11-kit: libffi is optional, not mandatory

---
Changes v1 -> v2 (after review of Baruch Siach):
- Use += instead of =

 package/p11-kit/Config.in  | 1 -
 package/p11-kit/p11-kit.mk | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
package/p11-kit/Config.in +0 -1
index a6b7261886..5690418756 100644
@@ -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.
package/p11-kit/p11-kit.mk +8 -1
index 1f72e0515b..fef4791831 100644
@@ -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))
Signature · 1 line
2.29.2
#1 lore raw

PATCH v2 2/2 package/p11-kit: libtasn1 is optional, not mandatory

---
Changes v1 -> v2 (after review of Baruch Siach):
- Use += instead of =

 package/p11-kit/Config.in  | 1 -
 package/p11-kit/p11-kit.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
package/p11-kit/Config.in +0 -1
index 5690418756..9be76c2f41 100644
@@ -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
package/p11-kit/p11-kit.mk +7 -1
index fef4791831..c2a7b23e9d 100644
@@ -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))
Signature · 1 line
2.29.2
#2 lore raw

PATCH v2 1/2 package/p11-kit: libffi is optional, not mandatory

In reply to Fabrice Fontaine
Quoted 4 lines · On Mon, 21 Dec 2020 13:36:17 +0100 Fabrice Fontaine…

---
Changes v1 -> v2 (after review of Baruch Siach):
- Use += instead of =

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com