d8a2955a2b
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>
41 lines
1.2 KiB
Makefile
41 lines
1.2 KiB
Makefile
################################################################################
|
|
#
|
|
# libssh2
|
|
#
|
|
################################################################################
|
|
|
|
LIBSSH2_VERSION = 1.7.0
|
|
LIBSSH2_SITE = http://www.libssh2.org/download
|
|
LIBSSH2_LICENSE = BSD
|
|
LIBSSH2_LICENSE_FILES = COPYING
|
|
LIBSSH2_INSTALL_STAGING = YES
|
|
LIBSSH2_CONF_OPTS = --disable-examples-build
|
|
|
|
# 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 \
|
|
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
|
|
--without-openssl
|
|
# configure.ac forgets to link to dependent libraries of gcrypt breaking static
|
|
# linking
|
|
LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
|
|
else
|
|
LIBSSH2_DEPENDENCIES += openssl
|
|
LIBSSH2_CONF_OPTS += --with-openssl \
|
|
--with-libssl-prefix=$(STAGING_DIR)/usr \
|
|
--without-libgcrypt
|
|
endif
|
|
|
|
# Add zlib support if enabled
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
LIBSSH2_DEPENDENCIES += zlib
|
|
LIBSSH2_CONF_OPTS += --with-libz \
|
|
--with-libz-prefix=$(STAGING_DIR)/usr
|
|
else
|
|
LIBSSH2_CONF_OPTS += --without-libz
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|