diff options
| author | Karl Berry <karl@freefriends.org> | 2022-05-09 23:48:42 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2022-05-09 23:48:42 +0000 |
| commit | af6526e0a5ba31d986d04850e03c8722fb064917 (patch) | |
| tree | 2d27c0747ede6275740d224bd5e961916c3f3582 /Master/tlpkg/installer | |
| parent | d5a88ed97c4a316a0e0bafc10abccc3434edfdb6 (diff) | |
tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@63274 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
| -rwxr-xr-x | Master/tlpkg/installer/config.guess | 27 | ||||
| -rw-r--r-- | Master/tlpkg/installer/ctan-mirrors.pl | 4 |
2 files changed, 20 insertions, 11 deletions
diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess index 7f76b6228f7..160ecf0951b 100755 --- a/Master/tlpkg/installer/config.guess +++ b/Master/tlpkg/installer/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-09' +timestamp='2022-05-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1151,16 +1151,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl index 07baa915a4a..97567858b6c 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -179,12 +179,10 @@ $mirrors = { 'https://ctan.math.ca/tex-archive/' => 1, 'https://ctan.mirror.globo.tech/' => 1, 'https://ctan.mirror.rafal.ca/' => 1, + 'https://mirror.csclub.uwaterloo.ca/CTAN/' => 1, 'https://mirror.its.dal.ca/ctan/' => 1, 'https://muug.ca/mirror/ctan/' => 1, }, - 'Costa Rica' => { - 'https://mirrors.ucr.ac.cr/CTAN/' => 1, - }, 'USA' => { 'http://bay.uchicago.edu/CTAN/' => 1, 'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1, |