diff options
| -rw-r--r-- | src/curl.mk | 4 | ||||
| -rw-r--r-- | src/libssh2-1-fixes.patch | 71 | ||||
| -rw-r--r-- | src/libssh2.mk | 5 |
3 files changed, 59 insertions, 21 deletions
diff --git a/src/curl.mk b/src/curl.mk index 563e26b..7c94b3a 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -2,8 +2,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.50.3 -$(PKG)_CHECKSUM := 8c5457e2ecfc38d7e1103bf5e0f87895222340200de9ceefd300c3420698f5ea +$(PKG)_VERSION := 7.51.0 +$(PKG)_CHECKSUM := 9eef5f6bbb972ffc631f4c76cfe93161bf5186926133c77267b24f5191700518 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) diff --git a/src/libssh2-1-fixes.patch b/src/libssh2-1-fixes.patch index 4c20a6d..004d07b 100644 --- a/src/libssh2-1-fixes.patch +++ b/src/libssh2-1-fixes.patch @@ -1,24 +1,61 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From a1d0ed70e2c94d89d0b598eacca6ac79b8cd5508 Mon Sep 17 00:00:00 2001 +From 65ae975e2a670869580e289d5d9bf255d2a10209 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 2 Sep 2012 00:55:28 +0200 -Subject: [PATCH] include gpg-error with gcrypt for static linking +Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking (mxe-specific) +Git rid of the extra -lgcrypt here since we have to pass the +whole list via LIBS. Otherwise, LIBS gets simplified with +-lgcrypt appearing only after its static dependencies. + +diff --git a/acinclude.m4 b/acinclude.m4 +index 734ef07..a6ee65a 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -423,7 +423,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ + 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" + found_crypto=libgcrypt + else + # restore +-- +2.9.3 + + +From fb65371e600772e72491f06a368a727c96d525c7 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 7 Nov 2016 10:47:13 +0100 +Subject: [PATCH 2/2] fix yes/no in lib path + -diff --git a/configure.ac b/configure.ac -index 563fb04..16caa88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -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 - AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes") +diff --git a/acinclude.m4 b/acinclude.m4 +index a6ee65a..510a0d3 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -386,10 +386,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [ + + old_LDFLAGS=$LDFLAGS + old_CFLAGS=$CFLAGS +- if test -n "$use_mbedtls" && test "$use_mbedtls" != "no"; then +- LDFLAGS="$LDFLAGS -L$use_mbedtls/lib" +- CFLAGS="$CFLAGS -I$use_mbedtls/include" +- fi + + AC_LIB_HAVE_LINKFLAGS([mbedtls], [], [ + #include <mbedtls/version.h> +@@ -412,10 +408,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ + + old_LDFLAGS=$LDFLAGS + old_CFLAGS=$CFLAGS +- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then +- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" +- CFLAGS="$CFLAGS -I$use_libgcrypt/include" +- fi + AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ + #include <gcrypt.h> + ]) -- -2.1.0 +2.9.3 diff --git a/src/libssh2.mk b/src/libssh2.mk index 8d29807..5efcf87 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -2,8 +2,8 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.0 -$(PKG)_CHECKSUM := e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 +$(PKG)_VERSION := 1.8.0 +$(PKG)_CHECKSUM := 39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4 $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE) @@ -23,6 +23,7 @@ define $(PKG)_BUILD --disable-examples-build \ --without-openssl \ --with-libgcrypt \ + LIBS="`$(PREFIX)/$(TARGET)/bin/libgcrypt-config --libs`" \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) |