Mercurial > mxe-octave
changeset 3846:02c08b655d54
libssh2: update v1.5.0 from mxe (devel)
* src/libssh2.mk: update version,checksum, disable examples
* src/libssh2-1-fixes.patch: update patch file
| author | John Donoghue |
|---|---|
| date | Fri, 13 Mar 2015 07:57:30 -0400 |
| parents | b4ef7ebff8b5 |
| children | 61da12fcda03 |
| files | src/libssh2-1-fixes.patch src/libssh2.mk |
| diffstat | 2 files changed, 12 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libssh2-1-fixes.patch Thu Mar 12 20:26:45 2015 -0400 +++ b/src/libssh2-1-fixes.patch Fri Mar 13 07:57:30 2015 -0400 @@ -1,29 +1,25 @@ This file is part of MXE. See index.html for further information. --- -1.7.10.4 - - -From 75ecbf4e5ca3c977418f60db42ba03c13d0e68f9 Mon Sep 17 00:00:00 2001 +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 2/2] include gpg-error with gcrypt for static linking +Subject: [PATCH] include gpg-error with gcrypt for static linking (mxe-specific) diff --git a/configure.ac b/configure.ac -index dfc6988..748dd21 100644 +index 563fb04..16caa88 100644 --- a/configure.ac +++ b/configure.ac -@@ -103,6 +103,7 @@ fi - if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>]) +@@ -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 - - AC_SUBST(LIBSREQUIRED) + AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes") -- -1.7.10.4 +2.1.0
--- a/src/libssh2.mk Thu Mar 12 20:26:45 2015 -0400 +++ b/src/libssh2.mk Fri Mar 13 07:57:30 2015 -0400 @@ -3,8 +3,8 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.3 -$(PKG)_CHECKSUM := c27ca83e1ffeeac03be98b6eef54448701e044b0 +$(PKG)_VERSION := 1.5.0 +$(PKG)_CHECKSUM := d9a97a04aef8bcf835b22a7a2e8e869782baa3aa $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE) @@ -24,6 +24,7 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ + --disable-examples-build \ --without-openssl \ --with-libgcrypt \ PKG_CONFIG='$(MXE_PKG_CONFIG)' && $(CONFIGURE_POST_HOOK)