blob: a79b29550275ea10d10e3f45c41844ee0b79d8c0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 4 Feb 2013 16:11:12 +0100
Subject: [PATCH 1/3] add missing private lib to pc file
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index f1a4157..9b1ed59 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.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-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
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
2.5.0
From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Nov 2014 08:56:48 +0100
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
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
--
2.5.0
From 46316cbe2097bfebc0681819ae11df4b77a1315d Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 24 Nov 2015 12:54:32 +0100
Subject: [PATCH 3/3] tools: don't call endservent in windows
diff --git a/src/socket.c b/src/socket.c
index 8991089..be8a4a1 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -33,8 +33,11 @@
#include <stdlib.h>
#include <unistd.h>
#ifndef _WIN32
-#include <arpa/inet.h>
-#include <signal.h>
+# include <arpa/inet.h>
+# include <signal.h>
+#else
+# undef endservent
+# define endservent()
#endif
#include <socket.h>
#include <c-ctype.h>
--
2.5.0
|
