summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-23 01:23:19 +0000
committerKarl Berry <karl@freefriends.org>2018-12-23 01:23:19 +0000
commitbde5806d438cecb7b984acd54ea72980eebf7b34 (patch)
treea72b1a6493042b3e0d853ece8e7c6e47143ea0ce /Master/tlpkg
parentf12519203804261354c40ef2140329556b491ccd (diff)
tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@49484 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/installer/config.guess23
-rw-r--r--Master/tlpkg/installer/ctan-mirrors.pl3
2 files changed, 14 insertions, 12 deletions
diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess
index 94c4ac154a3..28bec27b307 100755
--- a/Master/tlpkg/installer/config.guess
+++ b/Master/tlpkg/installer/config.guess
@@ -391,15 +391,20 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
- case `isainfo -b` in
- 32)
- echo i386-pc-solaris2"$UNAME_REL"
- ;;
- 64)
- echo x86_64-pc-solaris2"$UNAME_REL"
- ;;
- esac
+ set_cc_for_build
+ SUN_ARCH=i386
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH=x86_64
+ fi
+ fi
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 4f94ee17c89..58371246649 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -4,7 +4,6 @@ $mirrors = {
'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,
'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
'http://mirror.ufs.ac.za/ctan/' => 1
@@ -32,7 +31,6 @@ $mirrors = {
'http://repo.iut.ac.ir/tex-archive/' => 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
@@ -113,7 +111,6 @@ $mirrors = {
'http://piotrkosoft.net/pub/mirrors/CTAN/' => 1
},
'Portugal' => {
- 'ftp://ftp.di.uminho.pt/pub/ctan/' => 1,
'ftp://ftp.ist.utl.pt/pub/ctan/' => 1,
'http://mirrors.up.pt/pub/CTAN/' => 1
},