summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Barnett <rjbarnet@rockwellcollins.com>2013-09-26 13:59:34 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-26 14:54:52 (GMT)
commit471629063069e2f6ef9b9a2abb9bd323cc26c3ad (patch)
tree93fb5749673cca493ebb511396e2c17a66028103
parent8f8a5d84130fa7afb2f7cda10c7c0edec2cb3ae5 (diff)
downloadbuildroot-471629063069e2f6ef9b9a2abb9bd323cc26c3ad.tar.gz
buildroot-471629063069e2f6ef9b9a2abb9bd323cc26c3ad.tar.bz2
libssh2: fix library search path issues
Fix issues with some toolchains not finding libssl or libgcrypt. Fixes http://autobuild.buildroot.net/results/eeaaf41c0c5f88357af8445750dce776774c2b5d Fixes http://autobuild.buildroot.net/results/7a2590a7c3a1f52590f3e886b7cf9d04ad966a10 [Peter: indentation fixup] Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libssh2/libssh2.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
index 10eb5ed..19df9af 100644
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -15,10 +15,14 @@ LIBSSH2_CONF_OPT = --disable-examples-build
# Only select openssl if libgcrypt is not selected
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSSH2_DEPENDENCIES += libgcrypt
-LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl
+LIBSSH2_CONF_OPT += --with-libgcrypt \
+ --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
+ --without-openssl
else
LIBSSH2_DEPENDENCIES += openssl
-LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt
+LIBSSH2_CONF_OPT += --with-openssl \
+ --with-libssl-prefix=$(STAGING_DIR)/usr \
+ --without-libgcrypt
endif
# Add zlib support if enabled