diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-07-17 23:07:44 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-07-17 23:07:44 (GMT) |
| commit | 310c1f74e1ed8e75e7046405ff8496cccb240cac (patch) | |
| tree | bd5d97feb8dd06ff93b2c9bf44a04db754deee19 /src/gnutls-1-fixes.patch | |
| parent | b7ee9d2c88b5af2b7baf4b6b0573b7b554578ae7 (diff) | |
| download | mxe-310c1f74e1ed8e75e7046405ff8496cccb240cac.zip mxe-310c1f74e1ed8e75e7046405ff8496cccb240cac.tar.gz mxe-310c1f74e1ed8e75e7046405ff8496cccb240cac.tar.bz2 | |
package gnutls: workaround for automake
Diffstat (limited to 'src/gnutls-1-fixes.patch')
| -rw-r--r-- | src/gnutls-1-fixes.patch | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index acfd62f..ce74227 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -6,11 +6,8 @@ Contains ad hoc patches for cross building. From 18aa82eb060ca9ded9720091300a6c31af8382a9 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 28 Oct 2011 09:23:41 +0200 -Subject: [PATCH 1/4] add missing static library linking +Subject: [PATCH 1/5] add missing static library linking ---- - lib/gnutls.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index c45f8f3..57d0dbb 100644 @@ -31,11 +28,8 @@ index c45f8f3..57d0dbb 100644 From bd254ee873a2f7d6027661beae5d88372f10aa93 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 24 Nov 2011 15:06:06 +0100 -Subject: [PATCH 2/4] disable doc and test (mingw-cross-env specific) +Subject: [PATCH 2/5] disable doc and test (mingw-cross-env specific) ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0afe4bd..da7436a 100644 @@ -57,13 +51,10 @@ index 0afe4bd..da7436a 100644 From dce8795ce40246c87fc83d1879f02c9923dba2ed Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 3 Apr 2012 13:58:42 +0200 -Subject: [PATCH 3/4] Revert "make dist will also make lzip compressed +Subject: [PATCH 3/5] Revert "make dist will also make lzip compressed tarball" This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0ad765c..74b778e 100644 @@ -85,13 +76,10 @@ index 0ad765c..74b778e 100644 From ae55a00b99a60b65e459ebe7ada215ace70b56db Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 6 Jun 2012 09:57:24 +0200 -Subject: [PATCH 4/4] AM_PROG_AR for automake 1.12 compatibility +Subject: [PATCH 4/5] AM_PROG_AR for automake 1.12 compatibility Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 74b778e..d045aaf 100644 @@ -108,3 +96,26 @@ index 74b778e..d045aaf 100644 -- 1.7.10.4 + +From dd5b4ce15f94ba9bdbbab9d5036eea0a284e9715 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Wed, 18 Jul 2012 00:58:59 +0200 +Subject: [PATCH 5/5] relax automake + + +diff --git a/configure.ac b/configure.ac +index d045aaf..e9afeb4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.19], [bug-gnutls@gnu.org]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + +-- +1.7.10.4 + |