From 0eefb70700ef65af5cc3a390d38b72baea6e7396 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Jan 2018 01:23:18 +0000 Subject: tl-update-auto git-svn-id: svn://tug.org/texlive/trunk@46470 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/config.guess | 9 ++++++++- Master/tlpkg/installer/ctan-mirrors.pl | 11 ++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess index ae5ffc72f4b..9baaa270bfc 100755 --- a/Master/tlpkg/installer/config.guess +++ b/Master/tlpkg/installer/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-16' +timestamp='2018-01-26' # 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 @@ -150,6 +150,13 @@ Linux|GNU|GNU/*) #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl index 283881830ad..322700475a9 100644 --- a/Master/tlpkg/installer/ctan-mirrors.pl +++ b/Master/tlpkg/installer/ctan-mirrors.pl @@ -1,8 +1,5 @@ $mirrors = { 'Africa' => { - 'Algeria' => { - 'http://ctan.epst-tlemcen.dz/tex-archive/' => 1 - }, 'South Africa' => { 'http://ctan.mirror.ac.za/' => 1, 'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1, @@ -23,8 +20,7 @@ $mirrors = { }, 'Iran' => { 'http://ctan.asis.io/' => 1, - 'http://ctan.yazd.ac.ir/' => 1, - 'http://repo.iut.ac.ir/tex-archive/' => 1 + 'http://ctan.yazd.ac.ir/' => 1 }, 'Japan' => { 'ftp://ftp.kddilabs.jp/CTAN/' => 1, @@ -33,7 +29,6 @@ $mirrors = { 'http://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1 }, 'Korea' => { - 'http://ftp.kaist.ac.kr/pub/tex-archive/' => 1, 'http://ftp.ktug.org/tex-archive/' => 1, 'http://ftp.neowiz.com/CTAN/' => 1, 'http://mirror.navercorp.com/CTAN/' => 1 @@ -111,8 +106,7 @@ $mirrors = { }, 'Russia' => { 'http://ctan.altspu.ru/' => 1, - 'http://mirror.macomnet.net/pub/CTAN/' => 1, - 'http://mirrors.mi.ras.ru/CTAN/' => 1 + 'http://mirror.macomnet.net/pub/CTAN/' => 1 }, 'Serbia' => { 'http://ctan.mirror.ftn.uns.ac.rs/' => 1 @@ -137,7 +131,6 @@ $mirrors = { 'North America' => { 'Canada' => { 'http://ctan.forsale.plus/' => 1, - 'http://ctan.math.ca/tex-archive/' => 1, 'http://ctan.mirror.colo-serv.net/' => 1, 'http://ctan.mirror.rafal.ca/' => 1, 'http://mirror.its.dal.ca/ctan/' => 1, -- cgit v1.2.3