package/uacme: fix build with mbedtls and gnutls
PATCH 1/2 package/uacme: fix build with mbedtls and gnutls
mbedtls and gnutls can't be enabled at the same time so prefer gnutls to keep the same default behavior than the configure file
Fixes:
- http://autobuild.buildroot.org/results/a016b58d755cc0888680b345844f92de467329b2
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/uacme/uacme.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
package/uacme/uacme.mk +3 -9
@@ -13,18 +13,12 @@ UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl -ifeq ($(BR2_PACKAGE_MBEDTLS),y) -UACME_CONF_OPTS += --with-mbedtls -UACME_DEPENDENCIES += mbedtls -else -UACME_CONF_OPTS += --without-mbedtls -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) UACME_CONF_OPTS += --with-gnutls UACME_DEPENDENCIES += gnutls -else -UACME_CONF_OPTS += --without-gnutls +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +UACME_CONF_OPTS += --with-mbedtls +UACME_DEPENDENCIES += mbedtls endif $(eval $(autotools-package))
Signature · 1 line
2.23.0
PATCH 2/2 package/uacme: add openssl optional dependency
Select openssl if mbedtls or gnutls are not enabled
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/uacme/Config.in | 2 +- package/uacme/uacme.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
package/uacme/Config.in +1 -1
@@ -1,7 +1,7 @@ config BR2_PACKAGE_UACME bool "uacme" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_MBEDTLS if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_MBEDTLS) select BR2_PACKAGE_LIBCURL help uacme is a client for the ACMEv2 protocol described in
package/uacme/uacme.mk +3 -0
@@ -19,6 +19,9 @@ UACME_DEPENDENCIES += gnutls else ifeq ($(BR2_PACKAGE_MBEDTLS),y) UACME_CONF_OPTS += --with-mbedtls UACME_DEPENDENCIES += mbedtls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +UACME_CONF_OPTS += --with-openssl +UACME_DEPENDENCIES += openssl endif $(eval $(autotools-package))
Signature · 1 line
2.23.0
PATCH 1/2 package/uacme: fix build with mbedtls and gnutls
In reply to Fabrice FontaineQuoted 10 lines · On Thu, 3 Oct 2019 18:49:47 +0200 Fabrice Fontaine…
mbedtls and gnutls can't be enabled at the same time so prefer gnutls to keep the same default behavior than the configure file
Fixes:
- http://autobuild.buildroot.org/results/a016b58d755cc0888680b345844f92de467329b2Signed-off-by Fabrice Fontaine <[email protected]>--- package/uacme/uacme.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
Both applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com