diff options
Diffstat (limited to 'Master/tlpkg')
| -rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/luajittex.tlpsrc | 11 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/mflua.tlpsrc | 7 |
3 files changed, 7 insertions, 13 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc index c2e084b3043..7b97cc0ec15 100644 --- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc @@ -41,7 +41,7 @@ tlpsetvar global_luatex_deps \ 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, diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc index 7adeaf31703..2d839502dc7 100644 --- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc @@ -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 diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc index 40e4ea42512..d0cd6bc13f4 100644 --- a/Master/tlpkg/tlpsrc/mflua.tlpsrc +++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc @@ -3,9 +3,6 @@ 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 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 @@ runpattern d texmf-dist/metafont/mflua 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 |