summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2017-07-09 19:05:24 (GMT)
committerPeter Korsgaard <peter@korsgaard.com>2017-07-09 21:10:22 (GMT)
commit816ba1cee50e9808702304f137de688ce2908d62 (patch)
tree5a7dd64f3bbb03e6c67ec6e736a59f9dda1067ff
parent49dfb3306f4985907672a3734957b2198c068b15 (diff)
downloadbuildroot-816ba1cee50e9808702304f137de688ce2908d62.tar.gz
buildroot-816ba1cee50e9808702304f137de688ce2908d62.tar.bz2
libssh2: fix link with libgcrypt
libssh2 uses the implicit 'yes' argument of the --with-libgcrypt parameter as a library path prefix, which breaks the build. Pass the library path as --with-libgcrypt argument to fix that. Drop the unneeded --with-libgcrypt-prefix. Fixes: http://autobuild.buildroot.net/results/ac3/ac3a3f5871a6c20f5407a468809682ce491b9cb3/ http://autobuild.buildroot.net/results/ba3/ba31fa11b2ce2875649414dd9093e039dfc129e8/ http://autobuild.buildroot.net/results/b07/b07bbbf7fe164ba6dc435de6d8b41fadff7a3b08/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libssh2/libssh2.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index ab721ac..c658282 100644
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -15,8 +15,7 @@ LIBSSH2_CONF_OPTS = --disable-examples-build
# Favour libgcrypt.
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSSH2_DEPENDENCIES += libgcrypt
-LIBSSH2_CONF_OPTS += --with-libgcrypt \
- --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
+LIBSSH2_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr \
--without-openssl
# configure.ac forgets to link to dependent libraries of gcrypt breaking static
# linking