Mercurial > mxe-octave

annotate src/libssh2-1-fixes.patch @ 3710:1220a9158bc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make building 64-bit Windows binaries independent from enabling 64-bit indexing in Octave
author John W. Eaton <jwe@octave.org>
date Sun, 07 Sep 2014 06:42:40 -0400
parents 64912b529fc3
children 02c08b655d54
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
2232
961e62f6634a update package libssh2
Mark Brand <mabrand@mabrand.nl>
parents: 2060
diff changeset
4 --
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
5 1.7.10.4
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
6
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
7
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
8 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
9 From: Mark Brand <mabrand@mabrand.nl>
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
10 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
11 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
12 (mxe-specific)
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
13
2232
961e62f6634a update package libssh2
Mark Brand <mabrand@mabrand.nl>
parents: 2060
diff changeset
14
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
15 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
16 index dfc6988..748dd21 100644
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
17 --- a/configure.ac
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
18 +++ b/configure.ac
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
19 @@ -103,6 +103,7 @@ fi
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
20 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
21 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
22 LIBS="$LIBS -lgcrypt"
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
23 + 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
24 fi
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
25
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
26 AC_SUBST(LIBSREQUIRED)
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
27 --
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