texlive[62746] Master/tlpkg/tlpsrc: use global_no_luajit_platforms

commits+karl at tug.org commits+karl at tug.org
Wed Mar 16 23:25:48 CET 2022


Revision: 62746
          http://tug.org/svn/texlive?view=revision&revision=62746
Author:   karl
Date:     2022-03-16 23:25:47 +0100 (Wed, 16 Mar 2022)
Log Message:
-----------
use global_no_luajit_platforms instead of redundant defns

Modified Paths:
--------------
    trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
    trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/mflua.tlpsrc

Modified: trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc	2022-03-16 22:20:47 UTC (rev 62745)
+++ trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc	2022-03-16 22:25:47 UTC (rev 62746)
@@ -41,7 +41,7 @@
 cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data
 #
 # Platforms that don't support jit.
-tlpsetvar global_no_luajit_platforms x86_64-solaris
+tlpsetvar global_no_luajit_platforms i386-solaris,x86_64-solaris
 #
 # We define the Windows platform names here, so we can use ${wndws} in
 # the patterns, in preparation for supporting w64 in addition to w32,

Modified: trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc	2022-03-16 22:20:47 UTC (rev 62745)
+++ trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc	2022-03-16 22:25:47 UTC (rev 62746)
@@ -1,14 +1,11 @@
 category TLCore
 shortdesc LuaTeX with just-in-time (jit) compiler, with and without HarfBuzz
 
-# must keep in sync with mflua.tlpsrc.
-tlpsetvar no_luajit_platforms x86_64-solaris,i386-solaris
-#
 # Two engines plus texlua* links.
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajittex
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajit
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajitc
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajithbtex
+binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/luajittex
+binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/texluajit
+binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/texluajitc
+binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/luajithbtex
 #
 # Windows has additional .dll files as usual. The .exe are matched above.
 binpattern f bin/win32/luajit51.dll

Modified: trunk/Master/tlpkg/tlpsrc/mflua.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mflua.tlpsrc	2022-03-16 22:20:47 UTC (rev 62745)
+++ trunk/Master/tlpkg/tlpsrc/mflua.tlpsrc	2022-03-16 22:25:47 UTC (rev 62746)
@@ -3,9 +3,6 @@
 longdesc For information on this Lua-enabled Metafont,
 longdesc see, for example: tug.org/TUGboat/tb32-2/tb101scarso.pdf.
 
-# must keep in sync with luatex.tlpsrc.
-tlpsetvar no_luajit_platforms i386-solaris,x86_64-solaris
-
 # disabled until there is a user base.
 tlpsetvar fmtdeps luatex,metafont
 execute AddFormat name=mflua engine=mflua-nowin options="mf.ini" \
@@ -17,8 +14,8 @@
 binpattern f bin/${ARCH}/mflua
 binpattern f bin/${ARCH}/mflua-nowin
 
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit
-binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit-nowin
+binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/mfluajit
+binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/mfluajit-nowin
 
 # need metafont for support files, luatex for dll's, etc.
 depend metafont



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