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-1-fixes.patch | |
| 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-1-fixes.patch')
| -rw-r--r-- | src/gnutls-1-fixes.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch new file mode 100644 index 0000000..fee1cff --- /dev/null +++ b/src/gnutls-1-fixes.patch @@ -0,0 +1,49 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 6e89465f1e792f5d527708544cce1ef92ae4669b Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 28 Oct 2011 09:23:41 +0200 +Subject: [PATCH 1/2] add missing static library linking + + +diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in +index c45f8f3..57d0dbb 100644 +--- a/lib/gnutls.pc.in ++++ b/lib/gnutls.pc.in +@@ -19,6 +19,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: @LTLIBNETTLE@ ++Libs.private: @LTLIBNETTLE@ @LIBS@ + @GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} +-- +1.7.9.2 + + +From aa11a6f645ce93f80fbffd7e72c6964bdfd68542 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Thu, 24 Nov 2011 15:06:06 +0100 +Subject: [PATCH 2/2] disable doc and test (MXE specific) + + +diff --git a/Makefile.am b/Makefile.am +index 0afe4bd..da7436a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests + + SUBDIRS = gl lib extra po + +-SUBDIRS += src doc tests ++SUBDIRS += src + + if HAVE_GUILE + SUBDIRS += guile +-- +1.7.9.2 + |