summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-18 17:19:18 +0000
committerKarl Berry <karl@freefriends.org>2014-04-18 17:19:18 +0000
commit75c50943057d2439d26b99504f28ea4f9280b7c3 (patch)
treeb67fe7f549dc5725150c66424eb39b9843adfff8 /Master/tlpkg
parent3b88945316599bf9a0fd2cd437d897726c11d037 (diff)
continue initial 2014 updates: remove psutils scripts, new biber binaries, try luajittex again only on known platforms
git-svn-id: svn://tug.org/texlive/trunk@33519 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlpsrc/biber.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/luatex.tlpsrc20
2 files changed, 13 insertions, 9 deletions
diff --git a/Master/tlpkg/tlpsrc/biber.tlpsrc b/Master/tlpkg/tlpsrc/biber.tlpsrc
index c5376ca60ac..e1b3f9c69f3 100644
--- a/Master/tlpkg/tlpsrc/biber.tlpsrc
+++ b/Master/tlpkg/tlpsrc/biber.tlpsrc
@@ -1,12 +1,10 @@
# Not all platforms provide this.
binpattern f/!\
alpha-linux,\
-amd64-freebsd,\
amd64-kfreebsd,\
amd64-netbsd,\
armel-linux,\
armhf-linux,\
-i386-freebsd,\
i386-kfreebsd,\
i386-netbsd,\
mips-irix,\
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 24f5da1ddd5..3b5b34d3e70 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -7,10 +7,10 @@ execute AddFormat \
name=dviluatex engine=luatex patterns=language.def,language.dat.lua \
options="dviluatex.ini"
#
-# luajittex is not going to exist on all platforms. hmm.
-#execute AddFormat \
-# name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
-# options="luatex.ini"
+# On platforms where there is no luajittex, it will just be ignored?
+execute AddFormat \
+ name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
+ options="luatex.ini"
#
docpattern d texmf-dist/doc/luatex/base
docpattern f texmf-dist/doc/man/man1/luatex.*
@@ -22,10 +22,16 @@ runpattern f texmf-dist/web2c/texmfcnf.lua
#
binpattern f bin/${ARCH}/dviluatex
binpattern f bin/${ARCH}/luatex
-binpattern f bin/${ARCH}/luajittex
binpattern f bin/${ARCH}/texlua
-binpattern f bin/${ARCH}/texluajit
binpattern f bin/${ARCH}/texluac
-binpattern f bin/${ARCH}/texluajitc
#
binpattern f bin/win32/lua*.dll
+
+tlpsetvar no_luajit_platforms \
+ alpha-linux,amd64-kfreebsd,amd64-netbsd,armhf-linux,\
+i386-cygwin,i386-kfreebsd,i386-netbsd,i386-solaris,\
+mips-irix,mipsel-linux,powerpc-linux,sparc-solaris,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