diff options
| -rw-r--r-- | package/libssh/Config.in | 3 | ||||
| -rw-r--r-- | package/libssh/libssh.mk | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/libssh/Config.in b/package/libssh/Config.in index 6029f459d3..3dbfa7d561 100644 --- a/package/libssh/Config.in +++ b/package/libssh/Config.in @@ -4,8 +4,7 @@ config BR2_PACKAGE_LIBSSH depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # Either OpenSSL or libgcrypt are mandatory - 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 libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side. With libssh, diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 29bbf4e9f2..429e3c17c8 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -23,14 +23,14 @@ else LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF endif +# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. +# Favour libgcrypt. ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON LIBSSH_DEPENDENCIES += libgcrypt else LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF -ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSSH_DEPENDENCIES += openssl endif -endif $(eval $(cmake-package)) |
