summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-11-22 08:45:19 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-11-22 08:45:19 +0000
commitec9ca906a994c385dd682a5b5ebdf31f8b787ad6 (patch)
tree0368bf2db9387ef0b5ece126f16c7bc02a807928 /Build/source/utils/xindy
parentff3eec0cad86c0795b489e3ed82a88f9ed5ba3ab (diff)
xindy: Adapt for MinGW
git-svn-id: svn://tug.org/texlive/trunk@32209 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy')
-rw-r--r--Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog4
-rw-r--r--Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win328
-rw-r--r--Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win3210
-rw-r--r--Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c6
-rw-r--r--Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l6
5 files changed, 19 insertions, 15 deletions
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
index 98de56b2bba..1131380c590 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-0[34]-win32: Adapt Win32 changes to MinGW.
+
2013-10-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-70-persian: Use Makefile fragment.
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32 b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32
index 68e27d8ed65..4345e75cb87 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-03-win32
@@ -1,6 +1,6 @@
diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/tex2xindy/tex2xindy.l xindy-2.4/tex2xindy/tex2xindy.l
--- xindy-2.4.orig/tex2xindy/tex2xindy.l 2012-06-21 12:13:02.000000000 +0200
-+++ xindy-2.4/tex2xindy/tex2xindy.l 2012-09-27 14:37:06.000000000 +0200
++++ xindy-2.4/tex2xindy/tex2xindy.l 2013-11-22 09:25:00.000000000 +0100
@@ -89,11 +89,24 @@
=cut
@@ -12,10 +12,10 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/tex2xindy/tex2xindy.
#include <stdlib.h>
-#include <unistd.h>
+#ifdef WIN32
-+# include <kpathsea/getopt.h>
+# include <fcntl.h>
-+# define YY_NO_UNISTD_H 1
-+# ifdef W32TeX
++# ifndef __MINGW32__ /* this should be W32TeX */
++# include <kpathsea/getopt.h>
++# define YY_NO_UNISTD_H 1
+# define __STDC_VERSION__ 199901L
+# endif
+#else
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32 b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32
index 198053967e6..811dca47786 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-04-win32
@@ -1,15 +1,15 @@
diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/tex2xindy/tex2xindy.c xindy-2.4/tex2xindy/tex2xindy.c
---- xindy-2.4.orig/tex2xindy/tex2xindy.c 2012-06-21 12:14:36.000000000 +0200
-+++ xindy-2.4/tex2xindy/tex2xindy.c 2012-09-27 14:37:38.000000000 +0200
+--- xindy-2.4.orig/tex2xindy/tex2xindy.c 2013-11-22 09:30:35.299204605 +0100
++++ xindy-2.4/tex2xindy/tex2xindy.c 2013-11-22 09:27:49.000000000 +0100
@@ -1,5 +1,20 @@
+#line 95 "tex2xindy.l"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef WIN32
-+# include <kpathsea/getopt.h>
+# include <fcntl.h>
-+# define YY_NO_UNISTD_H 1
-+# ifdef W32TeX
++# ifndef __MINGW32__ /* this should be W32TeX */
++# include <kpathsea/getopt.h>
++# define YY_NO_UNISTD_H 1
+# define __STDC_VERSION__ 199901L
+# endif
+#else
diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c
index 232a58f2672..d2d573336e2 100644
--- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c
+++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.c
@@ -2,10 +2,10 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef WIN32
-# include <kpathsea/getopt.h>
# include <fcntl.h>
-# define YY_NO_UNISTD_H 1
-# ifdef W32TeX
+# ifndef __MINGW32__ /* this should be W32TeX */
+# include <kpathsea/getopt.h>
+# define YY_NO_UNISTD_H 1
# define __STDC_VERSION__ 199901L
# endif
#else
diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l
index dd3ef7ee7e6..edb6ea41be3 100644
--- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l
+++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/tex2xindy.l
@@ -95,10 +95,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <stdio.h>
#include <stdlib.h>
#ifdef WIN32
-# include <kpathsea/getopt.h>
# include <fcntl.h>
-# define YY_NO_UNISTD_H 1
-# ifdef W32TeX
+# ifndef __MINGW32__ /* this should be W32TeX */
+# include <kpathsea/getopt.h>
+# define YY_NO_UNISTD_H 1
# define __STDC_VERSION__ 199901L
# endif
#else