From: Daniel Dickinson <redacted>
Date: Mon, 11 Jan 2016 07:30:53 +0000 (-0500)
Subject: libs/gnutls: Fix selecting cryptodev support fails to depend on kmod-cryptodev
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6e288a01bf4967be19109d92c4228cc5f26161d7;p=openwrt-packages.git

libs/gnutls: Fix selecting cryptodev support fails to depend on kmod-cryptodev

It is not enough to select package kmod-cryptodev to avoid
build failure; there must be a Makefile dependency on
kmod-cryptodev in order for the build system to ensure
kmod-cryptodev (and it's headers) are present during build.

Therefore drop the select and add a conditional dependency.

Signed-off-by: Daniel Dickinson <redacted>
---

diff --git a/libs/gnutls/Config.in b/libs/gnutls/Config.in
index 59ca00f8f..fc3b31758 100644
--- a/libs/gnutls/Config.in
+++ b/libs/gnutls/Config.in
@@ -17,7 +17,6 @@ config GNUTLS_OCSP
 
 config GNUTLS_CRYPTODEV
 	bool "enable /dev/crypto support"
-	select PACKAGE_kmod-cryptodev
 	default n
 
 config GNUTLS_HEARTBEAT
diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 41b9c1c34..96f8351e7 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -93,7 +93,7 @@ endef
 define Package/libgnutls
 $(call Package/gnutls/Default)
   TITLE+= (library)
-  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1 +GNUTLS_PKCS11:p11-kit
+  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1 +GNUTLS_PKCS11:p11-kit +GNUTLS_CRYPTODEV:kmod-cryptodev
 endef
 
 define Package/libgnutls/description