Mercurial > mxe-octave
changeset 1953:fccf6239b8cd
update package gnutls
Now depends on p11-kit. This required some fixing up of gsoap
where the dependencies were hard-coded.
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Fri, 19 Aug 2011 14:18:25 +0200 |
| parents | cbbc5b45f1f8 |
| children | 4ade8a4371d0 |
| files | src/gnutls-1-fixes.patch src/gnutls.mk src/gsoap.mk |
| diffstat | 3 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gnutls-1-fixes.patch Fri Aug 19 14:14:58 2011 +0200 +++ b/src/gnutls-1-fixes.patch Fri Aug 19 14:18:25 2011 +0200 @@ -3,22 +3,22 @@ Contains ad hoc patches for cross building. -From 96f0ee1cc7e49cd7528baeb3732de747b38c7553 Mon Sep 17 00:00:00 2001 +From 2f8e6d6727a6140e12b8af09a64cdec05054162e Mon Sep 17 00:00:00 2001 From: mingw-cross-env -Date: Thu, 7 Jul 2011 21:23:47 +0200 +Date: Wed, 17 Aug 2011 14:01:51 +0200 Subject: [PATCH] adding missing ws2_32 to Libs.private diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index 2d3328c..661abe7 100644 +index bac5f42..eb4e6df 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system URL: http://www.gnu.org/software/gnutls/ Version: @VERSION@ Libs: -L${libdir} -lgnutls --Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ -+Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ -lws2_32 +-Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ ++Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @P11_KIT_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ -lws2_32 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} --
--- a/src/gnutls.mk Fri Aug 19 14:14:58 2011 +0200 +++ b/src/gnutls.mk Fri Aug 19 14:18:25 2011 +0200 @@ -3,14 +3,14 @@ # GnuTLS PKG := gnutls -$(PKG)_VERSION := 2.12.7 -$(PKG)_CHECKSUM := 41943d8f8648072a8e6a40cb213c91acf0451937 +$(PKG)_VERSION := 2.12.8 +$(PKG)_CHECKSUM := b250d3ddf3fafe69916f248d7ba909ae92022a35 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ $(PKG)_URL := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib libgcrypt +$(PKG)_DEPS := gcc zlib libgcrypt p11-kit define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \
--- a/src/gsoap.mk Fri Aug 19 14:14:58 2011 +0200 +++ b/src/gsoap.mk Fri Aug 19 14:18:25 2011 +0200 @@ -33,6 +33,8 @@ # wine confuses the cross-compiling detection, so set it explicitly $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' + # fix hard-coded gnutls dependencies + $(SED) -i "s/-lgnutls -lgcrypt -lgpg-error -lz/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure' # Build for mingw. Static by default. # Prevent undefined reference to _rpl_malloc.