Mercurial > mxe-octave
annotate src/libssh2-1-fixes.patch @ 4673:010dc6a420ff
stable-octave: bump version number
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 19 Apr 2018 21:57:06 -0400 |
| parents | 7ba850535b45 |
| children |
| rev | line source |
|---|---|
| 4269 | 1 From 65ae975e2a670869580e289d5d9bf255d2a10209 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
|
2 From: Mark Brand <mabrand@mabrand.nl> |
|
d427b570804c
package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents:
2549
diff
changeset
|
3 Date: Sun, 2 Sep 2012 00:55:28 +0200 |
| 4269 | 4 Subject: [PATCH 1/2] 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
|
5 (mxe-specific) |
|
d427b570804c
package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents:
2549
diff
changeset
|
6 |
| 4269 | 7 Git rid of the extra -lgcrypt here since we have to pass the |
| 8 whole list via LIBS. Otherwise, LIBS gets simplified with | |
| 9 -lgcrypt appearing only after its static dependencies. | |
| 10 | |
| 11 diff --git a/acinclude.m4 b/acinclude.m4 | |
| 12 index 734ef07..a6ee65a 100644 | |
| 13 --- a/acinclude.m4 | |
| 14 +++ b/acinclude.m4 | |
| 15 @@ -423,7 +423,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ | |
| 16 if test "$ac_cv_libgcrypt" = "yes"; then | |
| 17 AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt]) | |
| 18 LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face. | |
| 19 - LIBS="$LIBS -lgcrypt" | |
| 20 found_crypto=libgcrypt | |
| 21 else | |
| 22 # restore | |
| 23 -- | |
| 24 2.9.3 | |
| 25 | |
| 2232 | 26 |
| 4269 | 27 From fb65371e600772e72491f06a368a727c96d525c7 Mon Sep 17 00:00:00 2001 |
| 28 From: Mark Brand <mabrand@mabrand.nl> | |
| 29 Date: Mon, 7 Nov 2016 10:47:13 +0100 | |
| 30 Subject: [PATCH 2/2] fix yes/no in lib path | |
| 31 | |
| 32 | |
| 33 diff --git a/acinclude.m4 b/acinclude.m4 | |
| 34 index a6ee65a..510a0d3 100644 | |
| 35 --- a/acinclude.m4 | |
| 36 +++ b/acinclude.m4 | |
| 37 @@ -386,10 +386,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [ | |
| 38 | |
| 39 old_LDFLAGS=$LDFLAGS | |
| 40 old_CFLAGS=$CFLAGS | |
| 41 - if test -n "$use_mbedtls" && test "$use_mbedtls" != "no"; then | |
| 42 - LDFLAGS="$LDFLAGS -L$use_mbedtls/lib" | |
| 43 - CFLAGS="$CFLAGS -I$use_mbedtls/include" | |
| 44 - fi | |
| 45 | |
| 46 AC_LIB_HAVE_LINKFLAGS([mbedtls], [], [ | |
| 47 #include <mbedtls/version.h> | |
| 48 @@ -412,10 +408,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ | |
| 49 | |
| 50 old_LDFLAGS=$LDFLAGS | |
| 51 old_CFLAGS=$CFLAGS | |
| 52 - if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then | |
| 53 - LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" | |
| 54 - CFLAGS="$CFLAGS -I$use_libgcrypt/include" | |
| 55 - fi | |
| 56 AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ | |
| 57 #include <gcrypt.h> | |
| 58 ]) | |
|
2710
d427b570804c
package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents:
2549
diff
changeset
|
59 -- |
| 4269 | 60 2.9.3 |
|
2710
d427b570804c
package libssh2: use upstream fix for gcrypt dep
Mark Brand <mabrand@mabrand.nl>
parents:
2549
diff
changeset
|
61 |