Mercurial > mxe-octave

annotate src/libssh2-1-fixes.patch @ 2710:d427b570804c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package libssh2: use upstream fix for gcrypt dep
author Mark Brand <mabrand@mabrand.nl>
date Sun, 02 Sep 2012 01:06:53 +0200
parents f79b2ad2be45
children 64912b529fc3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2232
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
2060
712c65a5c54b package libssh2: convert patch line endings
Tony Theodore <tonyt@logyst.com>
parents: 2020
diff changeset
3
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
4 From 0e2179c67d0cd618be29b30425bda18c23a2ddf0 Mon Sep 17 00:00:00 2001
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
5 From: Dmitry Smirnov <onlyjob@member.fsf.org>
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
6 Date: Mon, 13 Aug 2012 23:34:51 +0200
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
7 Subject: [PATCH 1/2] configure: gcrypt doesn't come with pkg-config support
2232
961e62f6634a update package libssh2
Mark Brand <mabrand@mabrand.nl>
parents: 2060
diff changeset
8
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
9 ... so use plain old -lgcrypt to the linker to link with it.
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
10
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
11 Fixes #225
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
12 (cherry picked from commit e470738a0cf302abfd2891b80dbac4ac3e7eedd2)
2060
712c65a5c54b package libssh2: convert patch line endings
Tony Theodore <tonyt@logyst.com>
parents: 2020
diff changeset
13
2535
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 diff --git a/configure.ac b/configure.ac
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
15 index aa9d397..dfc6988 100644
2535
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 --- a/configure.ac
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 +++ b/configure.ac
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
18 @@ -102,7 +102,7 @@ fi
2535
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 # Look for libgcrypt
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 - LIBSREQUIRED=libgcrypt
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
23 + LIBS="$LIBS -lgcrypt"
2535
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 fi
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 AC_SUBST(LIBSREQUIRED)
2232
961e62f6634a update package libssh2
Mark Brand <mabrand@mabrand.nl>
parents: 2060
diff changeset
27 --
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
28 1.7.10.4
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
29
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
30
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
31 From 75ecbf4e5ca3c977418f60db42ba03c13d0e68f9 Mon Sep 17 00:00:00 2001
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
32 From: Mark Brand <mabrand@mabrand.nl>
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
33 Date: Sun, 2 Sep 2012 00:55:28 +0200
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
34 Subject: [PATCH 2/2] include gpg-error with gcrypt for static linking
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
35 (mxe-specific)
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
36
2232
961e62f6634a update package libssh2
Mark Brand <mabrand@mabrand.nl>
parents: 2060
diff changeset
37
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
38 diff --git a/configure.ac b/configure.ac
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
39 index dfc6988..748dd21 100644
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
40 --- a/configure.ac
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
41 +++ b/configure.ac
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
42 @@ -103,6 +103,7 @@ fi
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
43 if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
44 AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
45 LIBS="$LIBS -lgcrypt"
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
46 + LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
47 fi
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
48
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
49 AC_SUBST(LIBSREQUIRED)
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
50 --
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
51 1.7.10.4
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
52