diff options
| author | Karl Berry <karl@freefriends.org> | 2020-06-16 23:53:38 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-06-16 23:53:38 +0000 |
| commit | ee600ab3d0c1fc84d08b4a5648b438b5c4aa3293 (patch) | |
| tree | d7dcba09d8a66fad50f6d8bedc1e986386a0c700 /Master/tlpkg | |
| parent | 39cf0fb0ce267c4268d59c41f5386dc4d060de28 (diff) | |
tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@55573 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
| -rwxr-xr-x | Master/tlpkg/installer/config.guess | 12 | ||||
| -rw-r--r-- | Master/tlpkg/installer/ctan-mirrors.pl | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess index 11fda528bc7..92bfc33e296 100755 --- a/Master/tlpkg/installer/config.guess +++ b/Master/tlpkg/installer/config.guess @@ -1095,7 +1095,17 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if [ "$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 + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl index 1522434629d..26f822e561d 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -16,7 +16,6 @@ $mirrors = { 'http://mirror.lzu.edu.cn/CTAN/' => 1, 'http://mirrors.cqu.edu.cn/CTAN/' => 1, 'http://mirrors.hit.edu.cn/CTAN/' => 1, - 'http://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1, 'http://mirrors.ustc.edu.cn/CTAN/' => 1, 'https://mirror.bjtu.edu.cn/CTAN/' => 1, 'https://mirrors.bfsu.edu.cn/CTAN/' => 1, @@ -37,7 +36,6 @@ $mirrors = { 'http://ctan.yazd.ac.ir/' => 1, }, 'Japan' => { - 'ftp://ftp.kddilabs.jp/CTAN/' => 1, 'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1, 'http://ftp.jaist.ac.jp/pub/CTAN/' => 1, 'http://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1, @@ -45,7 +43,6 @@ $mirrors = { 'Korea' => { 'http://ftp.harukasan.org/CTAN/' => 1, 'http://ftp.kaist.ac.kr/pub/tex-archive/' => 1, - 'http://ftp.ktug.org/tex-archive/' => 1, 'http://mirror.kakao.com/CTAN/' => 1, 'http://mirror.navercorp.com/CTAN/' => 1, 'http://mirror.yongbok.net/ctan/' => 1, |