mirror of https://git.wownero.com/dsc/mxe.git
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
This file is part of MXE.
|
|
See index.html for further information.
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
From 239dc102017197025ef37cda8fa26b3750f18fb9 Mon Sep 17 00:00:00 2001
|
|
From: MXE
|
|
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 a25fcdf..3860c68 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@ @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
|
|
@GNUTLS_REQUIRES_PRIVATE@
|
|
Cflags: -I${includedir}
|
|
--
|
|
2.3.2 (Apple Git-55)
|
|
|
|
|
|
From 02e79ee0c18ff148e315c223675370ad11673bf6 Mon Sep 17 00:00:00 2001
|
|
From: MXE
|
|
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/output.c b/lib/x509/output.c
|
|
index e82fe84..2e62418 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.3.2 (Apple Git-55)
|
|
|