annotate src/libssh2-1-fixes.patch @ 4043:b54e00ea56bc

of-fl-core: readd fl-core patch in dos mode * src/of-fl-core-1-fixes.patch: readd patch
author John Donoghue
date Fri, 02 Oct 2015 10:24:38 -0400
parents 02c08b655d54
children 7ba850535b45
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
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
4 From a1d0ed70e2c94d89d0b598eacca6ac79b8cd5508 Mon Sep 17 00:00:00 2001
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
5 From: Mark Brand <mabrand@mabrand.nl>
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
6 Date: Sun, 2 Sep 2012 00:55:28 +0200
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
7 Subject: [PATCH] include gpg-error with gcrypt for static linking
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
8 (mxe-specific)
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
9
2232
961e62f6634a update package libssh2
Mark Brand <mabrand@mabrand.nl>
parents: 2060
diff changeset
10
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
11 diff --git a/configure.ac b/configure.ac
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
12 index 563fb04..16caa88 100644
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
13 --- a/configure.ac
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
14 +++ b/configure.ac
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
15 @@ -124,6 +124,7 @@ if test "$ac_cv_libgcrypt" = "yes"; then
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
16 AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt])
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
17 LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face.
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
18 LIBS="$LIBS -lgcrypt"
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
19 + LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
20 found_crypto=libgcrypt
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
21 fi
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
22 AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes")
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
23 --
3846
02c08b655d54 libssh2: update v1.5.0 from mxe (devel)
John Donoghue
parents: 3680
diff changeset
24 2.1.0
2710
d427b570804c package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents: 2549
diff changeset
25