diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/gnutls.mk | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/gnutls.mk')
| -rw-r--r-- | src/gnutls.mk | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/src/gnutls.mk b/src/gnutls.mk index d3ae002..902aaf9 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -1,30 +1,30 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# GnuTLS PKG := gnutls -$(PKG)_VERSION := 2.12.5 -$(PKG)_CHECKSUM := dd45d4fb7c365d18803b9eafef838b310c899d67 +$(PKG)_CHECKSUM := 2e2adc41e0c75d8170fdca5955bd007ae93ceada $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) -$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ -$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gnutls/$($(PKG)_FILE) +$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz +$(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 nettle zlib 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 '^2\.' | \ head -1 endef define $(PKG)_BUILD - echo '/* DEACTIVATED */' > '$(1)/gl/gai_strerror.c' - $(SED) -i 's/^\(SUBDIRS.*\) tests/\1/;' '$(1)/Makefile.in' - $(SED) -i 's/^\(SUBDIRS.*\) doc/\1/;' '$(1)/Makefile.in' - $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.in' + $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' + cd '$(1)' && aclocal -I m4 -I gl/m4 -I src/libopts/m4 --install + cd '$(1)' && autoconf + cd '$(1)' && automake + # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw. + # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx cd '$(1)' && ./configure \ --host='$(TARGET)' \ --enable-static \ @@ -34,9 +34,15 @@ define $(PKG)_BUILD --disable-guile \ --with-included-libtasn1 \ --with-included-libcfg \ - --with-included-pakchois \ - --with-libgcrypt \ - --without-lzo \ - LIBS='-lz' - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= + --without-p11-kit \ + --disable-silent-rules \ + CPPFLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400' \ + LIBS='-lws2_32' \ + ac_cv_prog_AR='$(TARGET)-ar' + $(MAKE) -C '$(1)' -j '$(JOBS)' install + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gnutls.exe' \ + `'$(TARGET)-pkg-config' gnutls --cflags --libs` endef |