summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2016-11-07 08:28:03 (GMT)
committerMark Brand <mabrand@mabrand.nl>2016-11-07 08:28:03 (GMT)
commit46ef1415e16e5af0d9a80047d6427fe382833158 (patch)
treeeb0e6b269e3600e7b86cea41a6ecff34f9d9cef4 /src
parent1d55cc4f44df6c947164ce7c397980ca074ad909 (diff)
downloadmxe-46ef1415e16e5af0d9a80047d6427fe382833158.zip
mxe-46ef1415e16e5af0d9a80047d6427fe382833158.tar.gz
mxe-46ef1415e16e5af0d9a80047d6427fe382833158.tar.bz2
libssh2: restore accidentally removed patch
commit 130624690fd5a48b0abb5a903546b60a8739eae0 did it.
Diffstat (limited to 'src')
-rw-r--r--src/libssh2-1-fixes.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch
new file mode 100644
index 0000000..4c20a6d
--- /dev/null
+++ b/src/libssh2-1-fixes.patch
@@ -0,0 +1,24 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+From a1d0ed70e2c94d89d0b598eacca6ac79b8cd5508 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 2 Sep 2012 00:55:28 +0200
+Subject: [PATCH] include gpg-error with gcrypt for static linking
+ (mxe-specific)
+
+
+diff --git a/configure.ac b/configure.ac
+index 563fb04..16caa88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -124,6 +124,7 @@ if test "$ac_cv_libgcrypt" = "yes"; then
+ AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt])
+ LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face.
+ LIBS="$LIBS -lgcrypt"
++ LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
+ found_crypto=libgcrypt
+ fi
+ AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes")
+--
+2.1.0
+