diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-10-28 23:54:39 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-10-28 23:54:39 (GMT) |
| commit | 048ad5130d21db1351c901311bf4e839408ba179 (patch) | |
| tree | 054bdb584e2ed7c10d5b8df7733772d07c49c638 | |
| parent | 35be2bbe289f58c5ddb6f660ed3caabe00d7f0f9 (diff) | |
| download | mxe-048ad5130d21db1351c901311bf4e839408ba179.zip mxe-048ad5130d21db1351c901311bf4e839408ba179.tar.gz mxe-048ad5130d21db1351c901311bf4e839408ba179.tar.bz2 | |
upgrade package gnutls
| -rw-r--r-- | src/gnutls-1-fixes.patch | 14 | ||||
| -rw-r--r-- | src/gnutls.mk | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index d68e8ba..705b60b 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,24 +3,24 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From 2f8e6d6727a6140e12b8af09a64cdec05054162e Mon Sep 17 00:00:00 2001 +From d5d9241c7e40cfc191dfc33c94381a3895e57cd5 Mon Sep 17 00:00:00 2001 From: mingw-cross-env -Date: Wed, 17 Aug 2011 14:01:51 +0200 -Subject: [PATCH] adding missing ws2_32 to Libs.private +Date: Fri, 28 Oct 2011 09:23:41 +0200 +Subject: [PATCH] add missing static library linking diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index bac5f42..eb4e6df 100644 +index 32170b6..6668a5e 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@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ -+Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @P11_KIT_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ -lws2_32 +-Libs.private: @LTLIBNETTLE@ ++Libs.private: @LTLIBNETTLE@ -lws2_32 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -1.7.6 +1.7.7 diff --git a/src/gnutls.mk b/src/gnutls.mk index 8723821..ed0fd4e 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -3,21 +3,20 @@ # GnuTLS PKG := gnutls -$(PKG)_VERSION := 2.12.12 -$(PKG)_CHECKSUM := 6c87591705b21f7cae845ecdae158a6c5d8f2847 +$(PKG)_VERSION := 3.0.5 +$(PKG)_CHECKSUM := 9ded8c3c7888d8e34fd019fe9a9c641dbd721e83 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) -$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(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 nettle define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \ grep '<a class="list name"' | \ $(SED) -n 's,.*<a[^>]*>gnutls_\([0-9]*_[0-9]*[02468]_[^<]*\)<.*,\1,p' | \ $(SED) 's,_,.,g' | \ - grep -v '^3\.' | \ head -1 endef @@ -35,11 +34,8 @@ define $(PKG)_BUILD --disable-guile \ --with-included-libtasn1 \ --with-included-libcfg \ - --with-included-pakchois \ - --with-libgcrypt \ - --without-lzo \ --without-p11-kit \ - LIBS='-lz' \ + LIBS='-lz -lws2_32' \ ac_cv_prog_AR='$(TARGET)-ar' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= |