diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-11 23:12:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-11 23:12:53 +0000 |
commit | e862d8a21dcb0963232806d243e63cf6586da7aa (patch) | |
tree | 9022664e8c3ef88b5567a428eb7476f4257d871e /Master/texmf-dist/scripts | |
parent | f3457b9144be4a631f7ced32587cc1ecb7af10a6 (diff) |
(check_executes): do not complain if luahbtex or
mfluajit are missing, as well as luajittex.
git-svn-id: svn://tug.org/texlive/trunk@52740 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 8fc8a37fee8..5b3fd98a3ad 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -5666,6 +5666,7 @@ sub check_executes { my %missingbins; my %missingengines; my %missinginis; + my @archs_to_check = $localtlpdb->available_architectures; for (keys %fmtlines) { my %r = TeXLive::TLUtils::parse_AddFormat_line("$_"); if (defined($r{"error"})) { @@ -5678,10 +5679,11 @@ sub check_executes { # special case for cont-en ... next if ($name eq "cont-en"); # we check that the name exist in bin/$arch - my @archs_to_check = $localtlpdb->available_architectures; - if ($engine eq "luajittex") { + if ($engine =~ /^(lua(jit|hb)tex|mfluajit)$/) { # luajittex is special since it is not available on all architectures - # due to inherent reasons (machine code) + # due to inherent reasons (machine code); + # luahbtex is special until we build it everywhere for TL'20. + # # We do not want to have error messages here, so we do the following: # * if tlpkg/tlpsrc/luatex.tlpsrc is available, then load it # and filter away those archs that are excluded with f/!... @@ -5689,6 +5691,7 @@ sub check_executes { # we just ignore it completely. my $tlpsrc_file = $localtlpdb->root . "/tlpkg/tlpsrc/luatex.tlpsrc"; if (-r $tlpsrc_file) { + ddebug("check_executes: found $tlpsrc_file\n"); require TeXLive::TLPSRC; my $tlpsrc = new TeXLive::TLPSRC; $tlpsrc->from_file($tlpsrc_file); @@ -5699,25 +5702,24 @@ sub check_executes { my $pt = $1; my $aa = $2; my $pr = $3; - if ($pr =~ m!/luajittex$!) { + if ($pr =~ m!/$engine$!) { # bingo, get the negative patterns if ($aa =~ m/^!(.*)$/) { @negarchs = split(/,/,$1); + ddebug("check_executes: negative arches: @negarchs\n"); } } } } - my %foo; + my @new_archs = (); for my $a (@archs_to_check) { - $foo{$a} = 1; - } - for my $a (@negarchs) { - delete $foo{$a} if defined($foo{$a}); + push (@new_archs, $a) unless grep { $a eq $_ } @negarchs; } - @archs_to_check = keys %foo; + @archs_to_check = @new_archs; } else { - @archs_to_check = (); + @archs_to_check = (); # no tlpsrc, check nothing. } + ddebug("check_executes: final arches to check: @archs_to_check\n"); } for my $a (@archs_to_check) { my $f = "$Master/bin/$a/$name"; |