texlive[50065] Build/source: mingw64 from luigi

commits+karl at tug.org commits+karl at tug.org
Tue Feb 19 23:23:53 CET 2019 

Revision: 50065
          http://tug.org/svn/texlive?view=revision&revision=50065
Author:   karl
Date:     2019-02-19 23:23:52 +0100 (Tue, 19 Feb 2019)
Log Message:
-----------
mingw64 from luigi

Modified Paths:
--------------
    trunk/Build/source/libs/pixman/configure
    trunk/Build/source/m4/ChangeLog
    trunk/Build/source/m4/kpse-win32.m4
    trunk/Build/source/texk/chktex/configure
    trunk/Build/source/texk/psutils/configure
    trunk/Build/source/texk/tex4htk/configure
    trunk/Build/source/texk/texlive/configure
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/am/luatex.am
    trunk/Build/source/utils/autosp/configure
    trunk/Build/source/utils/axodraw2/configure
    trunk/Build/source/utils/ps2eps/configure
    trunk/Build/source/utils/texdoctk/configure
    trunk/Build/source/utils/xindy/configure

Modified: trunk/Build/source/libs/pixman/configure
===================================================================
--- trunk/Build/source/libs/pixman/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/libs/pixman/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -4078,7 +4078,7 @@
 
 
 PIXMAN_VERSION_MAJOR=0
-PIXMAN_VERSION_MINOR=36
+PIXMAN_VERSION_MINOR=38
 PIXMAN_VERSION_MICRO=0
 
 test_CFLAGS=${CFLAGS+set} # We may override autoconf default CFLAGS.

Modified: trunk/Build/source/m4/ChangeLog
===================================================================
--- trunk/Build/source/m4/ChangeLog	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/m4/ChangeLog	2019-02-19 22:23:52 UTC (rev 50065)
@@ -1,3 +1,8 @@
+2019-02-18  Luigi Scarso  <luigi.scarso at gmail.com>
+
+	* kpse-win32.m4 (KPSE_COND_WIN32_WRAP): if w64 and mingw,
+	use different wrapper.
+
 2019-01-11  Karl Berry  <karl at freefriends.org>
 
 	* kpse-luajit-flags.m4 (KPSE_LUAJIT_FLAGS): try LIBLUAJIT_LDEXTRA,

Modified: trunk/Build/source/m4/kpse-win32.m4
===================================================================
--- trunk/Build/source/m4/kpse-win32.m4	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/m4/kpse-win32.m4	2019-02-19 22:23:52 UTC (rev 50065)
@@ -1,5 +1,7 @@
+# $Id$
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2016-2019 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
 # gives unlimited permission to copy and/or distribute it,
@@ -51,7 +53,9 @@
                                   [kpse_cv_have_win64=yes],
                                   [kpse_cv_have_win64=no])])
 AS_CASE([$kpse_cv_have_win64],
-        [yes], [WIN_WRAPPER=w64_wrapper],
+        [yes], [AS_IF([test "x$kpse_cv_have_win32=xmingw"],
+                      [WIN_WRAPPER=w64_mingw_wrapper],
+                      [WIN_WRAPPER=w64_wrapper])],
                [WIN_WRAPPER=w32_wrapper])
 AC_SUBST([WIN_WRAPPER])
 AM_CONDITIONAL([WIN32_WRAP],

Modified: trunk/Build/source/texk/chktex/configure
===================================================================
--- trunk/Build/source/texk/chktex/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/chktex/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -13773,7 +13773,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/texk/psutils/configure
===================================================================
--- trunk/Build/source/texk/psutils/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/psutils/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -15072,7 +15072,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/texk/tex4htk/configure
===================================================================
--- trunk/Build/source/texk/tex4htk/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/tex4htk/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -15235,7 +15235,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/texk/texlive/configure
===================================================================
--- trunk/Build/source/texk/texlive/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/texlive/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -3624,7 +3624,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/web2c/Makefile.in	2019-02-19 22:23:52 UTC (rev 50065)
@@ -18718,18 +18718,31 @@
 
 .PHONY: install-luatex-links uninstall-luatex-links
 .PHONY: install-luajittex-links uninstall-luajittex-links
- at WIN32_TRUE@install-luatex-links: call_luatex$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
- at WIN32_TRUE@uninstall-luatex-links:
- at WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
- at WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
- at WIN32_TRUE@install-luajittex-links: call_luajittex$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
- at WIN32_TRUE@	$(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
- at WIN32_TRUE@uninstall-luajittex-links:
- at WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
- at WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+
+ at MINGW32_TRUE@@WIN32_TRUE at install-luatex-links: .libs/luatex$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE@       $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE@       $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE at uninstall-luatex-links:
+ at MINGW32_TRUE@@WIN32_TRUE@       rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE@       rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE at install-luajittex-links: .libs/luajittex$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE@       $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE@       $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE at uninstall-luajittex-links:
+ at MINGW32_TRUE@@WIN32_TRUE@       rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
+ at MINGW32_TRUE@@WIN32_TRUE@       rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE at install-luatex-links: call_luatex$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE at uninstall-luatex-links:
+ at MINGW32_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE at install-luajittex-links: call_luajittex$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE at uninstall-luajittex-links:
+ at MINGW32_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
+ at MINGW32_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
 luatexdir/luatex.log luatexdir/luaimage.log: luatex$(EXEEXT)
 luatexdir/luajittex.log luatexdir/luajitimage.log: luajittex$(EXEEXT)
 $(xetex_OBJECTS): $(xetex_prereq)

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2019-02-19 22:23:52 UTC (rev 50065)
@@ -1,3 +1,7 @@
+2019-02-19 Luigi Scarso <luigi.scarso at gmail.com>
+	* am/luatex.am ([un]install-lua[jit]tex-links) [MINGW32]:
+	different commands for mingw.
+
 2018-08-27 Luigi Scarso <luigi.scarso at gmail.com>
 	* dropped dependency from gmp and mpfr
 

Modified: trunk/Build/source/texk/web2c/luatexdir/am/luatex.am
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/am/luatex.am	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/texk/web2c/luatexdir/am/luatex.am	2019-02-19 22:23:52 UTC (rev 50065)
@@ -112,7 +112,22 @@
 
 .PHONY: install-luatex-links uninstall-luatex-links
 .PHONY: install-luajittex-links uninstall-luajittex-links
+
 if WIN32
+if MINGW32
+install-luatex-links: .libs/luatex$(EXEEXT)
+       $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+       $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+uninstall-luatex-links:
+       rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+install-luajittex-links: .libs/luajittex$(EXEEXT)
+       $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
+       $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+uninstall-luajittex-links:
+       rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
+       rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+else !MINGW32
 install-luatex-links: call_luatex$(EXEEXT)
 	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
 	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
@@ -125,6 +140,7 @@
 uninstall-luajittex-links:
 	rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+endif !MINGW32
 endif WIN32
 
 # LuaTeX/LuaJITTeX Tests

Modified: trunk/Build/source/utils/autosp/configure
===================================================================
(Binary files differ)

Modified: trunk/Build/source/utils/axodraw2/configure
===================================================================
--- trunk/Build/source/utils/axodraw2/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/utils/axodraw2/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -4506,7 +4506,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/utils/ps2eps/configure
===================================================================
--- trunk/Build/source/utils/ps2eps/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/utils/ps2eps/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -4481,7 +4481,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/utils/texdoctk/configure
===================================================================
--- trunk/Build/source/utils/texdoctk/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/utils/texdoctk/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -3723,7 +3723,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

Modified: trunk/Build/source/utils/xindy/configure
===================================================================
--- trunk/Build/source/utils/xindy/configure	2019-02-19 22:23:14 UTC (rev 50064)
+++ trunk/Build/source/utils/xindy/configure	2019-02-19 22:23:52 UTC (rev 50065)
@@ -5091,7 +5091,11 @@
 $as_echo "$kpse_cv_have_win64" >&6; }
 case $kpse_cv_have_win64 in #(
   yes) :
-    WIN_WRAPPER=w64_wrapper ;; #(
+    if test "x$kpse_cv_have_win32=xmingw"; then :
+  WIN_WRAPPER=w64_mingw_wrapper
+else
+  WIN_WRAPPER=w64_wrapper
+fi ;; #(
   *) :
     WIN_WRAPPER=w32_wrapper ;;
 esac

More information about the tex-live-commits mailing list