[mingw-tcl: 21/25] Added a patch to fix compatibility with the mingw-w64 toolcain

[Kalev Lember]

commit d31563df53bb9059a6fd5c205a8aeb9fe1aa46b1
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Feb 27 21:08:08 2012 +0100

    Added a patch to fix compatibility with the mingw-w64 toolcain

 mingw32-tcl.spec                  |    3 +++
 tcl-8.5.6-mingw32.patch           |    6 +++---
 tcl-mingw-w64-compatibility.patch |   20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-tcl.spec b/mingw32-tcl.spec
index d9ec443..2e08763 100644
--- a/mingw32-tcl.spec
+++ b/mingw32-tcl.spec
@@ -38,6 +38,7 @@ Patch1: tcl-8.5.10-conf.patch
 Patch2: tcl-8.5.9-hidden.patch
 Patch4: tcl-8.5.6-mingw32.patch
 Patch5: tcl-nativetclsh.patch
+Patch6: tcl-mingw-w64-compatibility.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -61,6 +62,7 @@ chmod -x generic/tclThreadAlloc.c
 %patch2 -p1 -b .hidden
 %patch4 -p0 -b .mingw32
 %patch5 -p0 -b .nativetclsh
+%patch6 -p0 -b .mingw-w64
 
 %build
 pushd win
@@ -133,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.11-2
 - Rebuild against the mingw-w64 toolchain
+- Added a patch to fix compatibility with the mingw-w64 toolcain
 
 * Mon Jan 16 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 8.5.11-1
 - update 8.5.11
diff --git a/tcl-8.5.6-mingw32.patch b/tcl-8.5.6-mingw32.patch
index e54f467..1d5b78d 100644
--- a/tcl-8.5.6-mingw32.patch
+++ b/tcl-8.5.6-mingw32.patch
@@ -7,9 +7,9 @@
 -AC_CHECK_TOOL(AR, ar)
 -AC_CHECK_TOOL(RANLIB, ranlib)
 -AC_CHECK_TOOL(RC, windres)
-+AC_CHECK_TOOL(AR, i686-pc-mingw32-ar)
-+AC_CHECK_TOOL(RANLIB, i686-pc-mingw32-ranlib)
-+AC_CHECK_TOOL(RC, i686-pc-mingw32-windres)
++AC_CHECK_TOOL(AR, i686-w64-mingw32-ar)
++AC_CHECK_TOOL(RANLIB, i686-w64-mingw32-ranlib)
++AC_CHECK_TOOL(RC, i686-w64-mingw32-windres)
  
  #--------------------------------------------------------------------
  # Checks to see if the make program sets the $MAKE variable.
diff --git a/tcl-mingw-w64-compatibility.patch b/tcl-mingw-w64-compatibility.patch
new file mode 100644
index 0000000..76a8643
--- /dev/null
+++ b/tcl-mingw-w64-compatibility.patch
@@ -0,0 +1,20 @@
+--- generic/tclPosixStr.c.orig	2011-04-16 14:15:17.040226044 +0200
++++ generic/tclPosixStr.c	2011-04-16 14:16:16.798302930 +0200
+@@ -337,7 +337,7 @@
+ #if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
+     case EOPNOTSUPP: return "EOPNOTSUPP";
+ #endif
+-#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
++#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && !defined(E2BIG)
+     case EOVERFLOW: return "EOVERFLOW";
+ #endif
+ #ifdef EPERM
+@@ -785,7 +785,7 @@
+ #if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
+     case EOPNOTSUPP: return "operation not supported on socket";
+ #endif
+-#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
++#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && !defined(E2BIG)
+     case EOVERFLOW: return "file too big";
+ #endif
+ #ifdef EPERM