texlive[61335] Build/source: mingw patches from Siep and Luigi

commits+karl at tug.org commits+karl at tug.org
Fri Dec 17 17:42:00 CET 2021


Revision: 61335
          http://tug.org/svn/texlive?view=revision&revision=61335
Author:   karl
Date:     2021-12-17 17:42:00 +0100 (Fri, 17 Dec 2021)
Log Message:
-----------
mingw patches from Siep and Luigi

Modified Paths:
--------------
    trunk/Build/source/libs/icu/ChangeLog
    trunk/Build/source/libs/icu/Makefile.am
    trunk/Build/source/libs/icu/Makefile.in
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/hitexdir/ChangeLog
    trunk/Build/source/texk/web2c/hitexdir/am/hitex.am
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c
    trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h
    trunk/Build/source/texk/web2c/omegafonts/ChangeLog
    trunk/Build/source/texk/web2c/omegafonts/Makefile.am
    trunk/Build/source/texk/web2c/omegafonts/Makefile.in
    trunk/Build/source/texk/web2c/synctexdir/ChangeLog
    trunk/Build/source/texk/web2c/synctexdir/am/synctex.am
    trunk/Build/source/texk/web2c/synctexdir/synctex_main.c

Modified: trunk/Build/source/libs/icu/ChangeLog
===================================================================
--- trunk/Build/source/libs/icu/ChangeLog	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/libs/icu/ChangeLog	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1,3 +1,8 @@
+2021-12-17  Siep Kroonenberg  <siepo at bitmuis.nl>
+
+	* Makefile.am (icubuild): sense of test -r lib*.a was reversed.
+	https://tug.org/pipermail/tlbuild/2021q4/004980.html
+
 2021-03-01  Karl Berry  <karl at freefriends.org>
 
 	* icu-src/source/common/putil.cpp [DARWIN]: don't require

Modified: trunk/Build/source/libs/icu/Makefile.am
===================================================================
--- trunk/Build/source/libs/icu/Makefile.am	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/libs/icu/Makefile.am	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1,7 +1,7 @@
 ## $Id$
 ## Wrapper Makefile.am to build ICU for TeX Live.
 ##
-##   Copyright 2017 Karl Berry <tex-live at tug.org>
+##   Copyright 2017-2021 Karl Berry <tex-live at tug.org>
 ##   Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ##
 ##   This file is free software; the copyright holder
@@ -58,8 +58,8 @@
 endif cross
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
 # these two cp commands are a kludge for mingw cross compilation.
-	cd icu-build/lib && (test ! -r icudt.a || cp icudt.a libicudata.a)
-	cd icu-build/lib && (test ! -r libicuin.a || cp libicuin.a libicui18n.a)
+	cd icu-build/lib && (test -r libicudata.a || cp libicudt.a libicudata.a || cp icudt.a libicudata.a)
+	cd icu-build/lib && (test -r libicui18n.a || cp libicuin.a libicui18n.a)
 #
 	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 

Modified: trunk/Build/source/libs/icu/Makefile.in
===================================================================
--- trunk/Build/source/libs/icu/Makefile.in	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/libs/icu/Makefile.in	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1343,8 +1343,8 @@
 @cross_TRUE@	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
 # these two cp commands are a kludge for mingw cross compilation.
-	cd icu-build/lib && (test ! -r icudt.a || cp icudt.a libicudata.a)
-	cd icu-build/lib && (test ! -r libicuin.a || cp libicuin.a libicui18n.a)
+	cd icu-build/lib && (test -r libicudata.a || cp libicudt.a libicudata.a || cp icudt.a libicudata.a)
+	cd icu-build/lib && (test -r libicui18n.a || cp libicuin.a libicui18n.a)
 #
 	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/Makefile.in	2021-12-17 16:42:00 UTC (rev 61335)
@@ -145,7 +145,7 @@
 	$(am__append_78) $(am__append_82) $(am__append_85) \
 	$(am__append_106) $(am__append_107) $(am__append_108) \
 	$(am__append_109) $(am__append_117) $(am__append_119) \
-	$(am__append_121) $(am__append_155) libmd5/md5.test
+	$(am__append_121) $(am__append_156) libmd5/md5.test
 @WEB_TRUE at am__append_1 = $(web_programs)
 @WEB_TRUE at am__append_2 = $(web_tests)
 @TEX_TRUE at am__append_3 = tex
@@ -289,93 +289,94 @@
 @SYNCTEX_TRUE at am__append_122 = synctex
 @SYNCTEX_TRUE at am__append_123 = $(LTLIBSYNCTEX)
 @SYNCTEX_TRUE at am__append_124 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_125 = -lshlwapi
- at MINGW32_TRUE@am__append_126 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_127 = -I$(srcdir)/synctexdir \
+ at MINGW32_TRUE@am__append_125 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_126 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_127 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_130 = \
+ at TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_131 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
- at ETEX_SYNCTEX_TRUE@am__append_131 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_134 = \
+ at ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_135 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
- at PTEX_SYNCTEX_TRUE@am__append_135 = -I$(srcdir)/synctexdir \
+ at PTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
- at PTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_LIBS)
- at PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_DEPEND)
- at PTEX_SYNCTEX_TRUE@am__append_138 = \
+ at PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS)
+ at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND)
+ at PTEX_SYNCTEX_TRUE@am__append_139 = \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
 
- at UPTEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
+ at UPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
- at UPTEX_SYNCTEX_TRUE@am__append_140 = $(ZLIB_LIBS)
- at UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_DEPEND)
- at UPTEX_SYNCTEX_TRUE@am__append_142 = \
+ at UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS)
+ at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND)
+ at UPTEX_SYNCTEX_TRUE@am__append_143 = \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
 
- at EPTEX_SYNCTEX_TRUE@am__append_143 = -I$(srcdir)/synctexdir \
+ at EPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_144 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_146 = \
+ at EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS)
+ at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND)
+ at EPTEX_SYNCTEX_TRUE@am__append_147 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
- at EUPTEX_SYNCTEX_TRUE@am__append_147 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_148 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_150 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_151 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
- at PDFTEX_SYNCTEX_TRUE@am__append_151 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_152 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_153 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
- at XETEX_SYNCTEX_TRUE@am__append_153 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_154 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_154 = \
+ at XETEX_SYNCTEX_TRUE@am__append_155 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
- at SYNCTEX_TRUE@am__append_155 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_156 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -1600,8 +1601,9 @@
 am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
 synctex_OBJECTS = $(am_synctex_OBJECTS)
 am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ at MINGW32_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
 synctex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_14)
 nodist_tangle_OBJECTS = tangle.$(OBJEXT)
 tangle_OBJECTS = $(nodist_tangle_OBJECTS)
 tangle_LDADD = $(LDADD)
@@ -1617,9 +1619,9 @@
 am__objects_60 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
 nodist_tex_OBJECTS = $(am__objects_60) tex-tex-pool.$(OBJEXT)
 tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
- at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
+ at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
 tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_14)
+	$(am__DEPENDENCIES_15)
 nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
 tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
 tftopl_LDADD = $(LDADD)
@@ -1634,7 +1636,7 @@
 am_upbibtex_OBJECTS =
 nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
 upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
-am__DEPENDENCIES_15 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_16 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am_updvitype_OBJECTS =
 nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
@@ -1656,11 +1658,11 @@
 	$(am__objects_69) $(am__objects_70) upmpost-ptfmin.$(OBJEXT)
 nodist_upmpost_OBJECTS = $(am__objects_71)
 upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
-am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
-upmpost_DEPENDENCIES = $(am__DEPENDENCIES_16)
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_17)
 am_uppltotf_OBJECTS =
 nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
 uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
@@ -1675,7 +1677,7 @@
 am__objects_73 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
 nodist_uptex_OBJECTS = $(am__objects_73) uptex-uptex-pool.$(OBJEXT)
 uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
- at UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
+ at UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
 am_uptftopl_OBJECTS =
 nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
 uptftopl_OBJECTS = $(am_uptftopl_OBJECTS) $(nodist_uptftopl_OBJECTS)
@@ -1719,13 +1721,13 @@
 am__objects_75 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
 nodist_xetex_OBJECTS = $(am__objects_75) xetex-xetex-pool.$(OBJEXT)
 xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
- at XETEX_MACOSX_FALSE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_19 = $(libxetex) $(am__DEPENDENCIES_1) \
+ at XETEX_MACOSX_FALSE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_20 = $(libxetex) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_18)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_19) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_19)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_20) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
 xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
@@ -3824,18 +3826,18 @@
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_127)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_128)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_128)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_129)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_130)
+dist_tex_SOURCES = texextra.c $(am__append_131)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_129)
+tex_prereq = texd.h $(am__append_130)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -4311,10 +4313,10 @@
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_131)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_132)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_132)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_133)
 etex_DEPENDENCIES = $(ZLIB_DEPEND)
 
 # e-TeX C sources
@@ -4321,11 +4323,11 @@
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	etexdir/etex_version.h $(am__append_134)
+	etexdir/etex_version.h $(am__append_135)
 
 # We must create etexd.h and etexdir/etex_version.h before building the
 # etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_133)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_134)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -4354,10 +4356,10 @@
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_135)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_136)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_136)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_137)
 ptex_DEPENDENCIES = $(ptex_dependencies)
 
 # pTeX C sources
@@ -4364,10 +4366,10 @@
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
 dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_138)
+	ptexdir/ptex_version.h $(am__append_139)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_137)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_138)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch \
@@ -4411,11 +4413,11 @@
 	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test \
 	ptexdir/skipjfmp.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
-	$(ZLIB_INCLUDES) $(am__append_143)
+	$(ZLIB_INCLUDES) $(am__append_144)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_144)
+	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_145)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
 
 # e-pTeX C sources
@@ -4422,11 +4424,11 @@
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_146)
+	eptexdir/eptex_version.h $(am__append_147)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_145)
+	eptexdir/eptex_version.h $(am__append_146)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -4462,10 +4464,10 @@
 upweb_programs = upbibtex updvitype uppltotf uptftopl
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_139)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_140)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_140)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_141)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
@@ -4472,11 +4474,11 @@
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
 dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_142)
+	uptexdir/uptex_version.h $(am__append_143)
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
 uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_141)
+	uptexdir/uptex_version.h $(am__append_142)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch \
@@ -4524,11 +4526,11 @@
 	uptexdir/gkhuge.test
 
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
-	-I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_147)
+	-I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_148)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_148)
+	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_149)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
 
 # e-upTeX C sources
@@ -4535,12 +4537,12 @@
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_150)
+	$(am__append_151)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_149)
+	uptexdir/uptex_version.h $(am__append_150)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -4654,7 +4656,7 @@
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_151)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_152)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4667,7 +4669,7 @@
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_152)
+	$(am__append_153)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -5353,7 +5355,7 @@
 	$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
 	$(PPLIB_DEPEND) libmd5.a
 @XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_153)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_154)
 xetex_CFLAGS = $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5362,7 +5364,7 @@
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_154)
+	$(am__append_155)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -5498,13 +5500,13 @@
 synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_125)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_125)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_126)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_126)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_127)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \
@@ -22121,10 +22123,11 @@
 hitables.c: himktables
 	./himktables > $@ || { rm -f hitables.c; exit 1; }
 
-# This is our attempt to ensure that bison gets run before anything else,
-# when needed.
+# hitex and hishrink both need (at least) some of the sources generated
+# from hiformat.w.
 #
-$(hishrink_OBJECTS): $(srcdir)/hitexdir/hiparser.h
+$(hitex_OBJECTS): $(hiformat_c_h_l_y)
+$(hishrink_OBJECTS): $(hiformat_c_h_l_y)
 
 hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
 hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)

Modified: trunk/Build/source/texk/web2c/hitexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/ChangeLog	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/hitexdir/ChangeLog	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1,3 +1,8 @@
+2021-12-17  Luigi Scarso  <luigi.scarso at gmail.com>
+
+	* am/hitex.am (hitables.c): need $(EXEEXT) to execute himktables.
+	https://tug.org/pipermail/tlbuild/2021q4/004984.html
+
 2021-12-17  Akira Kakuto  <kakuto at jcom.zaq.ne.jp>
 
 	* hitex.w: Typo.

Modified: trunk/Build/source/texk/web2c/hitexdir/am/hitex.am
===================================================================
--- trunk/Build/source/texk/web2c/hitexdir/am/hitex.am	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/hitexdir/am/hitex.am	2021-12-17 16:42:00 UTC (rev 61335)
@@ -62,7 +62,7 @@
 
 # Generating hitables.c using himktables.
 hitables.c: himktables
-	./himktables > $@ || { rm -f hitables.c; exit 1; }
+	./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
 
 # hitex
 nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c)

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1,3 +1,8 @@
+2021-03-23 Siep Kroonenberg  <siepo at bitmuis.nl>
+    *luasocket/src/inet.[ch] (inet_pton, inet_ntop) [_WS2TCPIP_H_]:
+    don't define fns if _WS2TCPIP_H_ is defined; for mingw.
+    https://tug.org/pipermail/tlbuild/2021q4/004980.html
+
 2021-04-21 Luigi Scarso <luigi.scarso at gmail.com>
     *\discretionaryligaturemode: optionally block select disc creation 
     (see [Dev-luatex] [PATCH] Nested discretionaries M.F. Krüger) (HH)

Modified: trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c	2021-12-17 16:42:00 UTC (rev 61335)
@@ -519,6 +519,7 @@
 #endif
 
 #ifdef LUASOCKET_INET_PTON
+#ifndef _WS2TCPIP_H_
 int inet_pton(int af, const char *src, void *dst)
 {
     struct addrinfo hints, *res;
@@ -541,3 +542,4 @@
 }
 
 #endif
+#endif

Modified: trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h	2021-12-17 16:42:00 UTC (rev 61335)
@@ -47,8 +47,10 @@
 #endif
 
 #ifdef LUASOCKET_INET_PTON
+#ifndef _WS2TCPIP_H_
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
 int inet_pton(int af, const char *src, void *dst);
 #endif
+#endif
 
 #endif /* INET_H */

Modified: trunk/Build/source/texk/web2c/omegafonts/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1,3 +1,9 @@
+2021-12-16  Luigi Scarso  <luigi.scarso at gmail.com>
+
+	* Makefile.am (install-exec-hook) [WIN32]: sh syntax.
+	(Also found by Siep.)
+	https://tug.org/pipermail/tlbuild/2021q4/004983.html
+
 2021-11-03  Karl Berry  <karl at freefriends.org>
 
 	* Makefile.am (install-exec-hook) [WIN32]: install via libtool,

Modified: trunk/Build/source/texk/web2c/omegafonts/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/Makefile.am	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/omegafonts/Makefile.am	2021-12-17 16:42:00 UTC (rev 61335)
@@ -86,7 +86,7 @@
 if WIN32
 # same install happens in dvipdfmx.
 	for f in $(linked_programs); do \
-	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"
+	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"; \
 	done
 endif WIN32
 uninstall-hook: uninstall-bin-links

Modified: trunk/Build/source/texk/web2c/omegafonts/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/Makefile.in	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/omegafonts/Makefile.in	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1427,7 +1427,7 @@
 @OTANGLE_TRUE at install-exec-hook: install-bin-links
 # same install happens in dvipdfmx.
 @OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \
- at OTANGLE_TRUE@@WIN32_TRUE@	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"
+ at OTANGLE_TRUE@@WIN32_TRUE@	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) "$(DESTDIR)$(bindir)/$$f$(EXEEXT)"; \
 @OTANGLE_TRUE@@WIN32_TRUE@	done
 @OTANGLE_TRUE at uninstall-hook: uninstall-bin-links
 @OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \

Modified: trunk/Build/source/texk/web2c/synctexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/synctexdir/ChangeLog	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/synctexdir/ChangeLog	2021-12-17 16:42:00 UTC (rev 61335)
@@ -1,3 +1,10 @@
+2021-12-16  Luigi Scarso  <luigi.scarso at gmail.com>
+
+	* synctex_main.c [WIN32]: #include <kpathsea/progname.h>
+	* am/synctex.am (synctex_CPPFLAGS, synctex_LDADD) [MINGW32]:
+	include KPATHSEA_* variables.
+	https://tug.org/pipermail/tlbuild/2021q4/004983.html
+
 2021-07-24  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* synctex_main.c (synctex_test_file):

Modified: trunk/Build/source/texk/web2c/synctexdir/am/synctex.am
===================================================================
--- trunk/Build/source/texk/web2c/synctexdir/am/synctex.am	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/synctexdir/am/synctex.am	2021-12-17 16:42:00 UTC (rev 61335)
@@ -18,10 +18,14 @@
 	synctexdir/synctex_main.c
 
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
+if MINGW32
+synctex_CPPFLAGS += $(KPATHSEA_INCLUDES)
+endif MINGW32
 
+
 synctex_LDADD =  $(libsynctex) $(ZLIB_LIBS)
 if MINGW32
-synctex_LDADD += -lshlwapi
+synctex_LDADD += -lshlwapi $(KPATHSEA_LIBS)
 endif MINGW32
 
 $(synctex_OBJECTS): $(libsynctex)

Modified: trunk/Build/source/texk/web2c/synctexdir/synctex_main.c
===================================================================
--- trunk/Build/source/texk/web2c/synctexdir/synctex_main.c	2021-12-17 04:07:06 UTC (rev 61334)
+++ trunk/Build/source/texk/web2c/synctexdir/synctex_main.c	2021-12-17 16:42:00 UTC (rev 61335)
@@ -103,6 +103,11 @@
 #endif
 */
 
+#ifdef WIN32
+#   include <kpathsea/progname.h>
+#endif
+
+
 #if SYNCTEX_DEBUG
 #   ifdef WIN32
 #       include <direct.h>



More information about the tex-live-commits mailing list.