From 17e977995edf78fb75e726a2b6a097461186a90b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Jan 2020 23:34:36 +0000 Subject: revert to local tlpvar for the sake of tlmgr check executes (for now) git-svn-id: svn://tug.org/texlive/trunk@53322 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlpsrc/luajittex.tlpsrc | 9 ++++++--- Master/tlpkg/tlpsrc/mflua.tlpsrc | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc index d0e301f0f46..87558d84039 100644 --- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc @@ -1,9 +1,12 @@ category TLCore shortdesc LuaTeX with just-in-time (jit) compiler -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 +# must keep in sync with mflua.tlpsrc. +tlpsetvar no_luajit_platforms x86_64-solaris +# +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 bin/win32/luajit51.dll binpattern f bin/win32/luajittex.dll diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc index d0cd6bc13f4..827e2a52430 100644 --- a/Master/tlpkg/tlpsrc/mflua.tlpsrc +++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc @@ -3,6 +3,9 @@ shortdesc configuration and base files for MFLua 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 x86_64-solaris + # disabled until there is a user base. tlpsetvar fmtdeps luatex,metafont execute AddFormat name=mflua engine=mflua-nowin options="mf.ini" \ @@ -14,8 +17,8 @@ runpattern d texmf-dist/metafont/mflua binpattern f bin/${ARCH}/mflua binpattern f bin/${ARCH}/mflua-nowin -binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/mfluajit -binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/mfluajit-nowin +binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit +binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit-nowin # need metafont for support files, luatex for dll's, etc. depend metafont -- cgit v1.2.3