summaryrefslogtreecommitdiffstats
path: root/package/libssh2/libssh2.mk
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2016-09-08 23:11:48 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-09-11 22:49:04 +0200
commitd8a2955a2b82d75f3684e846b0c2411294233eea (patch)
treea99033a67911bf317cb9e188ed2818a9dec3a1b5 /package/libssh2/libssh2.mk
parent7ede9ca16e1726dfca333feba8b92cae3d5acf95 (diff)
downloadbuildroot-d8a2955a2b82d75f3684e846b0c2411294233eea.tar.gz
buildroot-d8a2955a2b82d75f3684e846b0c2411294233eea.zip
package/libssh2: fix dependency on libgcrypt
Since 2f89476 (package/libgpg-error: bump to version 1.23), libssh2 has inherited the dependency from libgcrypt (propagated from libgpg-error). However, since libssh2 can use either openssl or libgcrypt as a backend, the dependency should be relaxed when openssl is available. But the test is broken and inverted: it will make libssh unavailable as soon as openssl is enabled. Fix this dependenc byt doing what other similar packages do: select openssl if the other crypto backend (here libgcrypt) is not enabled. This also allows us to drop the propagated dependency on the arch condition. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Cc: Jörg Krause <joerg.krause@embedded.rocks> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Cc: Romain Naour <romain.naour@openwide.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libssh2/libssh2.mk')
-rw-r--r--package/libssh2/libssh2.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index 221fac473c..847c2f1b8e 100644
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -11,8 +11,8 @@ LIBSSH2_LICENSE_FILES = COPYING
LIBSSH2_INSTALL_STAGING = YES
LIBSSH2_CONF_OPTS = --disable-examples-build
-# libssh2 must use either libgcrypt or OpenSSL
-# Only select openssl if libgcrypt is not selected
+# Dependency is either on libgcrypt or openssl, guaranteed in Config.in.
+# Favour libgcrypt.
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSSH2_DEPENDENCIES += libgcrypt
LIBSSH2_CONF_OPTS += --with-libgcrypt \
OpenPOWER on IntegriCloud