mxe/src/gnutls-1-fixes.patch

96 lines
2.8 KiB
Diff
Raw Normal View History

2012-03-28 14:46:58 +01:00
This file is part of MXE.
2012-03-29 11:14:15 +01:00
See index.html for further information.
2011-07-07 20:39:38 +01:00
2013-08-18 10:23:14 +01:00
From 05cd16c35674665009d16f2469b9124c16638237 Mon Sep 17 00:00:00 2001
2012-04-03 13:05:49 +01:00
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 3 Apr 2012 13:58:42 +0200
2013-08-18 10:23:14 +01:00
Subject: [PATCH 1/4] Revert "make dist will also make lzip compressed tarball"
2012-04-03 13:05:49 +01:00
This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
diff --git a/configure.ac b/configure.ac
2013-08-18 10:23:14 +01:00
index 6459403..f8dd727 100644
2012-04-03 13:05:49 +01:00
--- a/configure.ac
+++ b/configure.ac
2013-03-25 22:00:03 +00:00
@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
2012-04-03 13:05:49 +01:00
AC_CONFIG_MACRO_DIR([m4])
2013-03-25 22:00:03 +00:00
AC_CANONICAL_HOST
2012-04-03 13:05:49 +01:00
2013-08-18 10:23:14 +01:00
-AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
+AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
2013-02-04 15:23:09 +00:00
AC_CONFIG_HEADERS([config.h])
--
2013-03-25 22:00:03 +00:00
1.8.1.4
2013-02-04 15:23:09 +00:00
2013-08-18 10:23:14 +01:00
From 6d7644c82de49b38afda2a171d1195861ebd9db0 Mon Sep 17 00:00:00 2001
2013-05-21 12:35:36 +01:00
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 6 Jun 2012 09:57:24 +0200
2013-08-18 10:23:14 +01:00
Subject: [PATCH 2/4] AM_PROG_AR for automake 1.12 compatibility
2013-05-21 12:35:36 +01:00
Taken from
http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
diff --git a/configure.ac b/configure.ac
2013-08-18 10:23:14 +01:00
index f8dd727..2c05458 100644
2013-05-21 12:35:36 +01:00
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ gl_EARLY
AM_PROG_AS
2013-08-18 10:23:14 +01:00
AM_PROG_AR
2013-05-21 12:35:36 +01:00
AC_PROG_CXX
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
# For includes/gnutls/gnutls.h.in.
AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`)
--
1.8.1.4
2013-08-18 10:23:14 +01:00
From 7afa4d386bb2076890113a5d4e665c39583ff025 Mon Sep 17 00:00:00 2001
2012-09-20 12:10:23 +01:00
From: Mark Brand <mabrand@mabrand.nl>
2013-02-04 15:23:09 +00:00
Date: Mon, 4 Feb 2013 16:11:12 +0100
2013-08-18 10:23:14 +01:00
Subject: [PATCH 3/4] add missing private lib to pc file
2012-09-20 12:10:23 +01:00
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
2013-08-18 10:23:14 +01:00
index a25fcdf..3860c68 100644
2012-09-20 12:10:23 +01:00
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
2013-03-25 22:00:03 +00:00
URL: http://www.gnutls.org/
2012-09-20 12:10:23 +01:00
Version: @VERSION@
Libs: -L${libdir} -lgnutls
2013-08-18 10:23:14 +01:00
-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32
2012-09-20 12:10:23 +01:00
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
2013-03-25 22:00:03 +00:00
1.8.1.4
2012-09-20 12:10:23 +01:00
2013-02-06 07:46:22 +00:00
2013-08-18 10:23:14 +01:00
From 903e858e59718f03fd3b3bef00fab897b0313007 Mon Sep 17 00:00:00 2001
2013-02-06 07:46:22 +00:00
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 6 Feb 2013 08:43:43 +0100
2013-08-18 10:23:14 +01:00
Subject: [PATCH 4/4] relax automake version check
2013-02-06 07:46:22 +00:00
diff --git a/configure.ac b/configure.ac
2013-08-18 10:23:14 +01:00
index 2c05458..dd45228 100644
2013-02-06 07:46:22 +00:00
--- a/configure.ac
+++ b/configure.ac
2013-03-25 22:00:03 +00:00
@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
2013-02-06 07:46:22 +00:00
AC_CONFIG_MACRO_DIR([m4])
2013-03-25 22:00:03 +00:00
AC_CANONICAL_HOST
2013-02-06 07:46:22 +00:00
2013-08-18 10:23:14 +01:00
-AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz -Wall -Wno-override])
2013-02-06 07:46:22 +00:00
+AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])
--
2013-03-25 22:00:03 +00:00
1.8.1.4
2013-02-06 07:46:22 +00:00