Contribs: ssh2, gcrypt needs gpg-error

8e51ef15 · Jean-Baptiste Kempf · 0d70f5f4 · 8e51ef15 · 8e51ef15
Commit 8e51ef15 authored Feb 24, 2015 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

contrib/src/ssh2/gpg-error-pc.patch contrib/src/ssh2/gpg-error-pc.patch +11 -0

contrib/src/ssh2/rules.mak contrib/src/ssh2/rules.mak +1 -0

No files found.
--- a/contrib/src/ssh2/gpg-error-pc.patch
+++ b/contrib/src/ssh2/gpg-error-pc.patch
+--- ssh2/configure.ac	2015-02-24 10:15:45.581842131 +0100
+++ ssh2/configure.ac.new	2015-02-24 10:15:34.948332253 +0100
+@@ -102,7 +102,7 @@
+ # Look for libgcrypt
+ if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
+   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+-  LIBS="$LIBS -lgcrypt"
+  LIBS="$LIBS -lgcrypt -lgpg-error"
+ fi
+ 
+ AC_SUBST(LIBSREQUIRED)
--- a/contrib/src/ssh2/rules.mak
+++ b/contrib/src/ssh2/rules.mak
@@ -19,6 +19,7 @@ ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2
 	$(UNPACK)
 	$(APPLY) $(SRC)/ssh2/no-tests.patch
 	$(APPLY) $(SRC)/ssh2/configure-zlib.patch
+	$(APPLY) $(SRC)/ssh2/gpg-error-pc.patch
 	$(MOVE)

 DEPS_ssh2 = gcrypt $(DEPS_gcrypt)