diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2016-09-08 23:11:47 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-09-11 22:48:56 +0200 |
| commit | 7ede9ca16e1726dfca333feba8b92cae3d5acf95 (patch) | |
| tree | 7c501379b1642f69364a0e67313a4824ab59a5a7 /package/libssh/Config.in | |
| parent | 349ae0df0656dd103583126d682f89629a7351cb (diff) | |
| download | buildroot-7ede9ca16e1726dfca333feba8b92cae3d5acf95.tar.gz buildroot-7ede9ca16e1726dfca333feba8b92cae3d5acf95.zip | |
package/libssh: fix dependency on libgcrypt
Since 2f89476 (package/libgpg-error: bump to version 1.23), libssh has
inherited the dependency from libgcrypt (propagated from libgpg-error).
However, since libssh 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.
This in itself is already incorrect, but that can cause further issues,
as some packages (e.g. Kodi) will select (indirectly) openssl, and has
an option to select libssh; enabling that option causes unmet direct
dependencies of libssh:
warning: (BR2_PACKAGE_KODI_LIBSSH) selects BR2_PACKAGE_LIBSSH which
has unmet direct dependencies (BR2_USE_MMU && !BR2_STATIC_LIBS &&
BR2_TOOLCHAIN_HAS_THREADS && BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
&& !BR2_PACKAGE_OPENSSL)
Fix this dependency by 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/libssh/Config.in')
| -rw-r--r-- | package/libssh/Config.in | 3 |
1 files changed, 1 insertions, 2 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, |
