diff options
| -rw-r--r-- | package/libssh2/Config.in | 3 | ||||
| -rw-r--r-- | package/libssh2/libssh2.mk | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in index 0deb3bbcf1..2944624e0a 100644 --- a/package/libssh2/Config.in +++ b/package/libssh2/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBSSH2 bool "libssh2" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS && !BR2_PACKAGE_OPENSSL # libgcrypt - select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help libssh2 is a client-side C library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS(22), 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 \ |
