mirror of https://git.wownero.com/dsc/mxe.git
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
From 7b62567c0820dd34afc177502638c702177dac39 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/2] add missing private lib to pc file
|
|
|
|
|
|
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
|
|
index 441b45d..9e2880a 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: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@
|
|
+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ -lcrypt32
|
|
@GNUTLS_REQUIRES_PRIVATE@
|
|
Cflags: -I${includedir}
|
|
--
|
|
2.9.3
|
|
|
|
|
|
From ed39e9884ea4a2ce8bd76e66d85d0579312517cd 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/2] 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/ip.c b/lib/x509/ip.c
|
|
index b4b31a4..85f1300 100644
|
|
--- a/lib/x509/ip.c
|
|
+++ b/lib/x509/ip.c
|
|
@@ -26,7 +26,11 @@
|
|
#include <gnutls/x509.h>
|
|
|
|
#ifdef HAVE_INET_NTOP
|
|
-# include <arpa/inet.h>
|
|
+# ifdef _WIN32
|
|
+# include <ws2tcpip.h>
|
|
+# else
|
|
+# include <arpa/inet.h>
|
|
+# endif
|
|
#endif
|
|
|
|
/*-
|
|
--
|
|
2.9.3
|
|
|