From 40c685605fff5c81fdbc5f7107d6bb26837570bb Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 13 Apr 2010 15:54:41 +0000 Subject: fix linux => mingw32 cross build git-svn-id: svn://tug.org/texlive/trunk@17843 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ptexenc/ChangeLog.TL | 6 ++++ Build/source/texk/ptexenc/Makefile.am | 20 ++++------- Build/source/texk/ptexenc/Makefile.in | 56 +++++++++++++---------------- Build/source/texk/ptexenc/ptexenc.c | 11 +++--- Build/source/texk/web2c/luatexdir/ChangeLog | 1 + Build/source/texk/web2c/luatexdir/luatex.c | 13 ++++++- 6 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 Build/source/texk/ptexenc/ChangeLog.TL (limited to 'Build/source/texk') diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL new file mode 100644 index 00000000000..a2796b0aaab --- /dev/null +++ b/Build/source/texk/ptexenc/ChangeLog.TL @@ -0,0 +1,6 @@ +ChangeLog.TL: TeX Live (TL) changes for ptexenc +=============================================== + +2010-04-12 Peter Breitenlohner + + * ptexenc.c (NOFILE) [MinGW32]: Always define it. diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index 75e136c1d16..fcc54254338 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -1,12 +1,10 @@ ## Makefile.am for the TeX Live subdirectory texk/ptexenc/ ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2010 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = COPYRIGHT ChangeLog README - INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/.. AM_CFLAGS = $(WARNING_CFLAGS) @@ -16,21 +14,15 @@ libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM) -libptexenc_la_LIBADD = $(LTLIBOBJS) - -## Put tex-file.c first, because it's what depends on the paths, and may -## reduce frustration if the paths are wrong by doing it first. -libptexenc_la_SOURCES = \ - ptexenc.c kanjicnv.c unicode.c unicode-jp.c - -$(libptexenc_la_OBJECTS): kanjicnv.h ptexenc.h unicode-jp.h unicode.h +libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c ptexencincludedir = ${includedir}/ptexenc -nodist_ptexencinclude_HEADERS = \ - c-auto.h +nodist_ptexencinclude_HEADERS = c-auto.h + +ptexencinclude_HEADERS = kanjicnv.h ptexenc.h unicode-jp.h unicode.h -ptexencinclude_HEADERS = kanjicnv.h ptexenc.h unicode-jp.h unicode.h +EXTRA_DIST = COPYRIGHT ChangeLog.TL ## Eventually delete these files ## diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index c71dedd84c3..b118ce5340a 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -92,10 +92,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(ptexencincludedir)" \ "$(DESTDIR)$(ptexencincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libptexenc_la_DEPENDENCIES = $(LTLIBOBJS) -am_libptexenc_la_OBJECTS = libptexenc_la-ptexenc.lo \ - libptexenc_la-kanjicnv.lo libptexenc_la-unicode.lo \ - libptexenc_la-unicode-jp.lo +libptexenc_la_LIBADD = +am_libptexenc_la_OBJECTS = libptexenc_la-kanjicnv.lo \ + libptexenc_la-ptexenc.lo libptexenc_la-unicode-jp.lo \ + libptexenc_la-unicode.lo libptexenc_la_OBJECTS = $(am_libptexenc_la_OBJECTS) libptexenc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -250,26 +250,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = COPYRIGHT ChangeLog README \ - patches/jmpost-0.04b-ptexenc.patch \ - patches/makejvf-1.1a-ptexenc.patch \ - patches/mendexk2.6f-ptexenc.patch \ - patches/ptex-src-3.1.11-ptexenc.patch \ - patches/texlive2009-ptexenc.patch patches/texlive2009.sh INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/.. AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libptexenc.la libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM) -libptexenc_la_LIBADD = $(LTLIBOBJS) -libptexenc_la_SOURCES = \ - ptexenc.c kanjicnv.c unicode.c unicode-jp.c - +libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c ptexencincludedir = ${includedir}/ptexenc -nodist_ptexencinclude_HEADERS = \ - c-auto.h - -ptexencinclude_HEADERS = kanjicnv.h ptexenc.h unicode-jp.h unicode.h +nodist_ptexencinclude_HEADERS = c-auto.h +ptexencinclude_HEADERS = kanjicnv.h ptexenc.h unicode-jp.h unicode.h +EXTRA_DIST = COPYRIGHT ChangeLog.TL patches/jmpost-0.04b-ptexenc.patch \ + patches/makejvf-1.1a-ptexenc.patch \ + patches/mendexk2.6f-ptexenc.patch \ + patches/ptex-src-3.1.11-ptexenc.patch \ + patches/texlive2009-ptexenc.patch patches/texlive2009.sh all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -392,13 +386,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libptexenc_la-ptexenc.lo: ptexenc.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libptexenc_la-ptexenc.lo -MD -MP -MF $(DEPDIR)/libptexenc_la-ptexenc.Tpo -c -o libptexenc_la-ptexenc.lo `test -f 'ptexenc.c' || echo '$(srcdir)/'`ptexenc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libptexenc_la-ptexenc.Tpo $(DEPDIR)/libptexenc_la-ptexenc.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexenc.c' object='libptexenc_la-ptexenc.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libptexenc_la-ptexenc.lo `test -f 'ptexenc.c' || echo '$(srcdir)/'`ptexenc.c - libptexenc_la-kanjicnv.lo: kanjicnv.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libptexenc_la-kanjicnv.lo -MD -MP -MF $(DEPDIR)/libptexenc_la-kanjicnv.Tpo -c -o libptexenc_la-kanjicnv.lo `test -f 'kanjicnv.c' || echo '$(srcdir)/'`kanjicnv.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libptexenc_la-kanjicnv.Tpo $(DEPDIR)/libptexenc_la-kanjicnv.Plo @@ -406,12 +393,12 @@ libptexenc_la-kanjicnv.lo: kanjicnv.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libptexenc_la-kanjicnv.lo `test -f 'kanjicnv.c' || echo '$(srcdir)/'`kanjicnv.c -libptexenc_la-unicode.lo: unicode.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libptexenc_la-unicode.lo -MD -MP -MF $(DEPDIR)/libptexenc_la-unicode.Tpo -c -o libptexenc_la-unicode.lo `test -f 'unicode.c' || echo '$(srcdir)/'`unicode.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libptexenc_la-unicode.Tpo $(DEPDIR)/libptexenc_la-unicode.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unicode.c' object='libptexenc_la-unicode.lo' libtool=yes @AMDEPBACKSLASH@ +libptexenc_la-ptexenc.lo: ptexenc.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libptexenc_la-ptexenc.lo -MD -MP -MF $(DEPDIR)/libptexenc_la-ptexenc.Tpo -c -o libptexenc_la-ptexenc.lo `test -f 'ptexenc.c' || echo '$(srcdir)/'`ptexenc.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libptexenc_la-ptexenc.Tpo $(DEPDIR)/libptexenc_la-ptexenc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexenc.c' object='libptexenc_la-ptexenc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libptexenc_la-unicode.lo `test -f 'unicode.c' || echo '$(srcdir)/'`unicode.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libptexenc_la-ptexenc.lo `test -f 'ptexenc.c' || echo '$(srcdir)/'`ptexenc.c libptexenc_la-unicode-jp.lo: unicode-jp.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libptexenc_la-unicode-jp.lo -MD -MP -MF $(DEPDIR)/libptexenc_la-unicode-jp.Tpo -c -o libptexenc_la-unicode-jp.lo `test -f 'unicode-jp.c' || echo '$(srcdir)/'`unicode-jp.c @@ -420,6 +407,13 @@ libptexenc_la-unicode-jp.lo: unicode-jp.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libptexenc_la-unicode-jp.lo `test -f 'unicode-jp.c' || echo '$(srcdir)/'`unicode-jp.c +libptexenc_la-unicode.lo: unicode.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libptexenc_la-unicode.lo -MD -MP -MF $(DEPDIR)/libptexenc_la-unicode.Tpo -c -o libptexenc_la-unicode.lo `test -f 'unicode.c' || echo '$(srcdir)/'`unicode.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libptexenc_la-unicode.Tpo $(DEPDIR)/libptexenc_la-unicode.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unicode.c' object='libptexenc_la-unicode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libptexenc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libptexenc_la-unicode.lo `test -f 'unicode.c' || echo '$(srcdir)/'`unicode.c + mostlyclean-libtool: -rm -f *.lo @@ -800,8 +794,6 @@ uninstall-am: uninstall-libLTLIBRARIES \ uninstall-ptexencincludeHEADERS -$(libptexenc_la_OBJECTS): kanjicnv.h ptexenc.h unicode-jp.h unicode.h - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/ptexenc/ptexenc.c b/Build/source/texk/ptexenc/ptexenc.c index f9e8f165527..613044341fd 100644 --- a/Build/source/texk/ptexenc/ptexenc.c +++ b/Build/source/texk/ptexenc/ptexenc.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -23,13 +24,11 @@ #define ESC '\033' -#ifdef HAVE_SYS_PARAM_H -#include -#else -#include -#endif /* HAVE_SYS_PARAM_H */ #ifndef NOFILE -#define NOFILE OPEN_MAX +# ifndef OPEN_MAX +# define OPEN_MAX 24 /* The POSIX minimum. */ +# endif +# define NOFILE OPEN_MAX #endif char *ptexenc_version_string = "ptetex " PTEXENC_VERSION; diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index f42fd211713..58a202eba19 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,6 +1,7 @@ 2010-04-13 Peter Breitenlohner * image/pdftoepdf.cc: Fix building with libpoppler. + * luatex.c: Fix building for MinGW32. 2010-04-13 Taco Hoekwater diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index d3bc2fb1b25..6c934579cfa 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -486,6 +486,9 @@ void topenin(void) incrementally. Shamim Mohamed adapted it for Web2c. */ #if defined (TeX) && defined (IPC) +# ifdef WIN32 +# include +# else # include # include # ifndef O_NONBLOCK /* POSIX */ @@ -499,6 +502,8 @@ what the fcntl ? cannot implement IPC without equivalent for O_NONBLOCK. # endif /* no FNDELAY */ # endif /* no O_NDELAY */ # endif /* no O_NONBLOCK */ +# endif /* !WIN32 */ + # ifndef IPC_PIPE_NAME /* $HOME is prepended to this. */ # define IPC_PIPE_NAME "/.TeXview_Pipe" # endif @@ -544,6 +549,12 @@ static int ipc_is_open(void) static void ipc_open_out(void) { +#ifdef WIN32 + u_long mode = 1; +#define SOCK_NONBLOCK(s) ioctlsocket (s, FIONBIO, &mode) +#else +#define SOCK_NONBLOCK(s) fcntl (s, F_SETFL, O_NONBLOCK) +#endif # ifdef IPC_DEBUG fputs("tex: Opening socket for IPC output ...\n", stderr); # endif @@ -559,7 +570,7 @@ static void ipc_open_out(void) sock = socket(PF_UNIX, SOCK_STREAM, 0); if (sock >= 0) { if (connect(sock, ipc_addr, ipc_addr_len) != 0 - || fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { + || SOCK_NONBLOCK (sock) < 0) { close(sock); sock = -1; return; -- cgit v1.2.3