[mingw-gnutls: 19/23] Fix compatibility with mingw-w64
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:23:02 UTC 2012
commit ee43622bca834211bc2860f6a2d4a465ea49396e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Feb 28 01:30:32 2012 +0100
Fix compatibility with mingw-w64
gnutls-mingw-compile-fix.patch | 22 ++++++++++++++++++++++
mingw32-gnutls.spec | 6 ++++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/gnutls-mingw-compile-fix.patch b/gnutls-mingw-compile-fix.patch
new file mode 100644
index 0000000..32c58a5
--- /dev/null
+++ b/gnutls-mingw-compile-fix.patch
@@ -0,0 +1,22 @@
+--- libextra/openssl_compat.h.orig 2011-07-04 16:30:35.300970884 +0200
++++ libextra/openssl_compat.h 2011-07-04 16:36:25.495478807 +0200
+@@ -26,6 +26,9 @@
+ #ifndef GNUTLS_COMPAT8_H
+ #define GNUTLS_COMPAT8_H
+
++#include <winsock2.h>
++#undef X509_NAME
++
+ /* Extra definitions */
+ #include <gnutls/openssl.h>
+
+--- src/cli.c.orig 2011-07-04 17:24:20.082828141 +0200
++++ src/cli.c 2011-07-04 17:25:39.664938552 +0200
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <sys/types.h>
+ #include <string.h>
+ #include <sys/time.h>
diff --git a/mingw32-gnutls.spec b/mingw32-gnutls.spec
index a78c027..52f377e 100644
--- a/mingw32-gnutls.spec
+++ b/mingw32-gnutls.spec
@@ -28,6 +28,9 @@ Patch3: gnutls-2.12.2-nosrp.patch
# Skip tests that are expected to fail on libgcrypt build
Patch4: gnutls-2.12.7-dsa-skiptests.patch
+# MinGW-specific patches.
+Patch1001: gnutls-mingw-compile-fix.patch
+
BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
@@ -69,6 +72,8 @@ for MinGW.
%patch3 -p1 -b .nosrp
%patch4 -p1 -b .dsa-skiptests
+%patch1001 -p0 -b .mingw_compile
+
for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
touch lib/$i
done
@@ -141,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.12.14-4
- Rebuild against the mingw-w64 toolchain
+- Fix compatibility with mingw-w64
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list