aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-12-30 20:20:38 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-01-11 22:38:43 +0100
commit18091b688617c9d6643cba63997fea695a1a61b4 (patch)
tree606eb177cf901dc47e92ae0bd1358187082841fa
parent949045a4cb49ae056966ee76dd78bd524219d534 (diff)
downloadbuildroot-18091b688617c9d6643cba63997fea695a1a61b4.tar.gz
buildroot-18091b688617c9d6643cba63997fea695a1a61b4.tar.bz2
package/p11-kit: fix build without tasn1
Commit d82da39d55ea16c3c8aa3c5a8ea91fd6c2ceafbb forgot to move BR2_PACKAGE_CA_CERTIFICATES condition under BR2_PACKAGE_LIBTASN1 to avoid the following build failure: checking if trust module is enabled... configure: WARNING: --with-libtasn1 is needed in order to build the trust module, disabling no checking for trust module paths... configure: error: need --enable-trust-module in order to specify trust module paths. Fixes: - http://autobuild.buildroot.org/results/e7f68205e1b776f9af34e6017f6eb17f46aa2f19 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 0ad12b3a6a74cea1f58242db8e92b8fce58d9367) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/p11-kit/p11-kit.mk19
1 files changed, 11 insertions, 8 deletions
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index c2a7b23e9d..1ffc7e21c8 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -13,12 +13,6 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
P11_KIT_LICENSE = BSD-3-Clause
P11_KIT_LICENSE_FILES = COPYING
-ifeq ($(BR2_PACKAGE_CA_CERTIFICATES),y)
-P11_KIT_CONF_OPTS += --with-trust-paths=/etc/ssl/certs/ca-certificates.crt
-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
@@ -28,9 +22,18 @@ endif
ifeq ($(BR2_PACKAGE_LIBTASN1),y)
P11_KIT_DEPENDENCIES += host-pkgconf libtasn1
-P11_KIT_CONF_OPTS += --with-libtasn1
+P11_KIT_CONF_OPTS += \
+ --enable-trust-module \
+ --with-libtasn1
+ifeq ($(BR2_PACKAGE_CA_CERTIFICATES),y)
+P11_KIT_CONF_OPTS += --with-trust-paths=/etc/ssl/certs/ca-certificates.crt
+else
+P11_KIT_CONF_OPTS += --without-trust-paths
+endif
else
-P11_KIT_CONF_OPTS += --without-libtasn1
+P11_KIT_CONF_OPTS += \
+ --disable-trust-module \
+ --without-libtasn1
endif
$(eval $(autotools-package))