diff options
author | Norbert Preining <norbert@preining.info> | 2020-07-08 03:01:45 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-07-08 03:01:45 +0000 |
commit | 8c3fedd243b69349b426144e5e2b94ef4aea6a4c (patch) | |
tree | f5842753f11a90141f3cc2e356c3a04766e8d81e /systems/texlive/tlnet/tlpkg/TeXLive | |
parent | ef87f13c4503a2aa4a9098cbf33e0bfcad19008e (diff) |
CTAN sync 202007080301
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive')
-rw-r--r-- | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm index cddf93f635..b66774755b 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 55178 2020-05-17 16:46:24Z karl $ +# $Id: TLUtils.pm 55776 2020-07-07 22:32:40Z karl $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007-2020 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 55178 $'; +my $svnrev = '$Revision: 55776 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -341,10 +341,9 @@ sub platform_name { if ($OS eq "darwin") { # We have two versions of Mac binary sets. - # 10.10/Yosemite and newer (Yosemite specially left over): - # -> x86_64-darwin [MacTeX] - # 10.6/Snow Leopard through 10.10/Yosemite: - # -> x86_64-darwinlegacy if 64-bit + # 10.x and newer -> x86_64-darwin [MacTeX] + # 10.6/Snow Leopard through 10.x -> x86_64-darwinlegacy, if 64-bit + # x changes every year. In 2020 (Big Sur) Apple started with 11.x. # # (BTW, uname -r numbers are larger by 4 than the Mac minor version. # We don't use uname numbers here.) @@ -356,13 +355,16 @@ sub platform_name { # returns "10.x" values), and sysctl (processor hardware). chomp (my $sw_vers = `sw_vers -productVersion`); my ($os_major,$os_minor) = split (/\./, $sw_vers); - if ($os_major != 10) { + if ($os_major < 10) { warn "$0: only MacOSX is supported, not $OS $os_major.$os_minor " . " (from sw_vers -productVersion: $sw_vers)\n"; return "unknownmac-unknownmac"; } - if ($os_minor >= $mactex_darwin) { - ; # current version, default is ok (x86_64-darwin). + if ($os_major >= 11) { + $CPU = "x86_64"; + $OS = "darwin"; + } elsif ($os_minor >= $mactex_darwin) { + ; # sufficiently new 10.x, default is ok (x86_64-darwin). } elsif ($os_minor >= 6 && $os_minor < $mactex_darwin) { # in between, x86 hardware only. On 10.6 only, must check if 64-bit, # since if later than that, always 64-bit. |