From 197fbea9e34baff3e1ddcb1027546da93b40180d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Feb 2019 22:23:52 +0000 Subject: mingw64 from luigi git-svn-id: svn://tug.org/texlive/trunk@50065 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/pixman/configure | 2 +- Build/source/m4/ChangeLog | 5 ++++ Build/source/m4/kpse-win32.m4 | 8 ++++-- Build/source/texk/chktex/configure | 6 ++++- Build/source/texk/psutils/configure | 6 ++++- Build/source/texk/tex4htk/configure | 6 ++++- Build/source/texk/texlive/configure | 6 ++++- Build/source/texk/web2c/Makefile.in | 37 +++++++++++++++++--------- Build/source/texk/web2c/luatexdir/ChangeLog | 4 +++ Build/source/texk/web2c/luatexdir/am/luatex.am | 16 +++++++++++ Build/source/utils/autosp/configure | 6 ++++- Build/source/utils/axodraw2/configure | 6 ++++- Build/source/utils/ps2eps/configure | 6 ++++- Build/source/utils/texdoctk/configure | 6 ++++- Build/source/utils/xindy/configure | 6 ++++- 15 files changed, 102 insertions(+), 24 deletions(-) (limited to 'Build') diff --git a/Build/source/libs/pixman/configure b/Build/source/libs/pixman/configure index 505ddfe81ba..be287c076fb 100755 --- a/Build/source/libs/pixman/configure +++ b/Build/source/libs/pixman/configure @@ -4078,7 +4078,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags 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. diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index e5f5d9f0d50..b4589fdc733 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2019-02-18 Luigi Scarso + + * kpse-win32.m4 (KPSE_COND_WIN32_WRAP): if w64 and mingw, + use different wrapper. + 2019-01-11 Karl Berry * kpse-luajit-flags.m4 (KPSE_LUAJIT_FLAGS): try LIBLUAJIT_LDEXTRA, diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4 index 8893ceb68c0..cdee44e2ec7 100644 --- a/Build/source/m4/kpse-win32.m4 +++ b/Build/source/m4/kpse-win32.m4 @@ -1,5 +1,7 @@ +# $Id$ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2015 Peter Breitenlohner +# Copyright 2016-2019 Karl Berry +# Copyright 2009-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -51,7 +53,9 @@ AC_CACHE_CHECK([for WIN64], [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], diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure index 3dc361addec..279a4708a3c 100755 --- a/Build/source/texk/chktex/configure +++ b/Build/source/texk/chktex/configure @@ -13773,7 +13773,11 @@ fi $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 diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure index a973f65845c..c5a5fc17687 100755 --- a/Build/source/texk/psutils/configure +++ b/Build/source/texk/psutils/configure @@ -15072,7 +15072,11 @@ fi $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 diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index a971b290db8..55b660606e6 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -15235,7 +15235,11 @@ fi $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 diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index 1877ced5d5d..8c4b670f02e 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/configure @@ -3624,7 +3624,11 @@ fi $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 diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 7a7e5b81130..b3a8e3aea20 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -18718,18 +18718,31 @@ $(luajittex_OBJECTS): libluajittex.a .PHONY: install-luatex-links uninstall-luatex-links .PHONY: install-luajittex-links uninstall-luajittex-links -@WIN32_TRUE@install-luatex-links: call_luatex$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) -@WIN32_TRUE@uninstall-luatex-links: -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) -@WIN32_TRUE@install-luajittex-links: call_luajittex$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) -@WIN32_TRUE@uninstall-luajittex-links: -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) + +@MINGW32_TRUE@@WIN32_TRUE@install-luatex-links: .libs/luatex$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@uninstall-luatex-links: +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@install-luajittex-links: .libs/luajittex$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@uninstall-luajittex-links: +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@install-luatex-links: call_luatex$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@uninstall-luatex-links: +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@install-luajittex-links: call_luajittex$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@uninstall-luajittex-links: +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@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) diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 62d4ab0491f..b5d13759fe3 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2019-02-19 Luigi Scarso + * am/luatex.am ([un]install-lua[jit]tex-links) [MINGW32]: + different commands for mingw. + 2018-08-27 Luigi Scarso * dropped dependency from gmp and mpfr diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 9d289ab00c6..0bf46639091 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -112,7 +112,22 @@ call_luajittex_LDADD = .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 @@ install-luajittex-links: call_luajittex$(EXEEXT) uninstall-luajittex-links: rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +endif !MINGW32 endif WIN32 # LuaTeX/LuaJITTeX Tests diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure index 32a1891589b..cd40cdbe90a 100755 --- a/Build/source/utils/autosp/configure +++ b/Build/source/utils/autosp/configure @@ -5368,7 +5368,11 @@ fi $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 diff --git a/Build/source/utils/axodraw2/configure b/Build/source/utils/axodraw2/configure index 9044078afa8..d33edb5a69b 100755 --- a/Build/source/utils/axodraw2/configure +++ b/Build/source/utils/axodraw2/configure @@ -4506,7 +4506,11 @@ fi $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 diff --git a/Build/source/utils/ps2eps/configure b/Build/source/utils/ps2eps/configure index 05bcae1bd25..214a36ff077 100755 --- a/Build/source/utils/ps2eps/configure +++ b/Build/source/utils/ps2eps/configure @@ -4481,7 +4481,11 @@ fi $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 diff --git a/Build/source/utils/texdoctk/configure b/Build/source/utils/texdoctk/configure index 59c89098ada..e31121d1a28 100755 --- a/Build/source/utils/texdoctk/configure +++ b/Build/source/utils/texdoctk/configure @@ -3723,7 +3723,11 @@ fi $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 diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 6cf63b6c09b..341ced26aea 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -5091,7 +5091,11 @@ fi $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 -- cgit v1.2.3