mxe/src/gnutls-1-fixes.patch

60 lines
1.7 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
Contains ad hoc patches for cross building.
2012-04-03 13:05:49 +01:00
2015-12-13 09:05:13 +00:00
From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
2013-02-04 15:23:09 +00:00
Date: Mon, 4 Feb 2013 16:11:12 +0100
2015-12-13 09:05:13 +00:00
Subject: [PATCH 1/3] 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
2015-12-13 09:05:13 +00:00
index f1a4157..9b1ed59 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
2015-12-13 09:05:13 +00:00
-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32
2012-09-20 12:10:23 +01:00
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
2015-12-13 09:05:13 +00:00
2.5.0
2015-12-13 09:05:13 +00:00
From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Nov 2014 08:56:48 +0100
2015-12-13 09:05:13 +00:00
Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop
Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a
Signed-off-by: Mark Brand <mabrand@mabrand.nl>
taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html
diff --git a/lib/x509/output.c b/lib/x509/output.c
2015-12-13 09:05:13 +00:00
index b126c30..a97d445 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -34,7 +34,11 @@
#include <gnutls-idna.h>
#ifdef HAVE_INET_NTOP
-# include <arpa/inet.h>
+# ifdef _WIN32
+# include <ws2tcpip.h>
+# else
+# include <arpa/inet.h>
+# endif
#endif
#define addf _gnutls_buffer_append_printf
--
2015-12-13 09:05:13 +00:00
2.5.0