summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2017-07-28 04:28:13 (GMT)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-29 13:52:19 (GMT)
commit908960d98ff0c88b93a916b857daf84e39182581 (patch)
tree6ff37476637c96564b7ea7579f9e6564d3bf4235
parente8097eb284bb289e3c872f9cb07aa1227ae93e67 (diff)
downloadbuildroot-908960d98ff0c88b93a916b857daf84e39182581.tar.gz
buildroot-908960d98ff0c88b93a916b857daf84e39182581.tar.bz2
libssh2: fix build with libgcrypt and mbedtls enabled
The --without-libgcrypt configure parameter is not enough to disable the libgcrypt back-end. This breaks the build when mbedtls (default backend) is enabled, and libgcrypt builds before libssh2. Seed ac_cv_libgcrypt to really disable libgcrypt when it is not the selected crypto back-end. Fixes: http://autobuild.buildroot.net/results/b4e/b4e39890e003e9e590a5bf17c9300c653020d88c/ http://autobuild.buildroot.net/results/45a/45a9b3559ceea4e1399794f9612f717f7c57a4a3/ http://autobuild.buildroot.net/results/ae4/ae4afec62ca297df1cd02350601f1d62fc3cd1b7/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libssh2/libssh2.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index 338f5b4..4127934 100644
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -17,6 +17,7 @@ ifeq ($(BR2_PACKAGE_MBEDTLS),y)
LIBSSH2_DEPENDENCIES += mbedtls
LIBSSH2_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr \
--without-openssl --without-libgcrypt
+LIBSSH2_CONF_ENV += ac_cv_libgcrypt=no
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSSH2_DEPENDENCIES += libgcrypt
LIBSSH2_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr \