Changeset 500 in MondoRescue for branches/stable/mondo/config.guess


Ignore:
Timestamp:
Apr 29, 2006, 1:50:55 AM (18 years ago)
Author:
bcornec
Message:

Internationalization follow up

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mondo/config.guess

    r498 r500  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
    5 #   Inc.
    6 
    7 timestamp='2006-04-26'
     4#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
     5
     6timestamp='2005-05-15'
    87
    98# This file is free software; you can redistribute it and/or modify it
    … …  
    108107trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    109108: ${TMPDIR=/tmp} ;
    110  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
     109 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    111110 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    112111 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
    … …  
    127126 ,,*)   CC_FOR_BUILD=$CC ;;
    128127 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
    129 esac ; set_cc_for_build= ;'
     128esac ;'
    130129
    131130# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
    … …  
    201200    echo "${machine}-${os}${release}"
    202201    exit ;;
     202    amd64:OpenBSD:*:*)
     203    echo x86_64-unknown-openbsd${UNAME_RELEASE}
     204    exit ;;
     205    amiga:OpenBSD:*:*)
     206    echo m68k-unknown-openbsd${UNAME_RELEASE}
     207    exit ;;
     208    cats:OpenBSD:*:*)
     209    echo arm-unknown-openbsd${UNAME_RELEASE}
     210    exit ;;
     211    hp300:OpenBSD:*:*)
     212    echo m68k-unknown-openbsd${UNAME_RELEASE}
     213    exit ;;
     214    luna88k:OpenBSD:*:*)
     215        echo m88k-unknown-openbsd${UNAME_RELEASE}
     216    exit ;;
     217    mac68k:OpenBSD:*:*)
     218    echo m68k-unknown-openbsd${UNAME_RELEASE}
     219    exit ;;
     220    macppc:OpenBSD:*:*)
     221    echo powerpc-unknown-openbsd${UNAME_RELEASE}
     222    exit ;;
     223    mvme68k:OpenBSD:*:*)
     224    echo m68k-unknown-openbsd${UNAME_RELEASE}
     225    exit ;;
     226    mvme88k:OpenBSD:*:*)
     227    echo m88k-unknown-openbsd${UNAME_RELEASE}
     228    exit ;;
     229    mvmeppc:OpenBSD:*:*)
     230    echo powerpc-unknown-openbsd${UNAME_RELEASE}
     231    exit ;;
     232    sgi:OpenBSD:*:*)
     233    echo mips64-unknown-openbsd${UNAME_RELEASE}
     234    exit ;;
     235    sun3:OpenBSD:*:*)
     236    echo m68k-unknown-openbsd${UNAME_RELEASE}
     237    exit ;;
    203238    *:OpenBSD:*:*)
    204     UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
    205     echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
     239    echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    206240    exit ;;
    207241    *:ekkoBSD:*:*)
    208242    echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
    209     exit ;;
    210     *:SolidBSD:*:*)
    211     echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
    212243    exit ;;
    213244    macppc:MirBSD:*:*)
    … …  
    628659    if [ ${HP_ARCH} = "hppa2.0w" ]
    629660    then
    630         eval $set_cc_for_build
     661        # avoid double evaluation of $set_cc_for_build
     662        test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
    631663
    632664        # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
    … …  
    769801    exit ;;
    770802    *:FreeBSD:*:*)
    771     case ${UNAME_MACHINE} in
    772         pc98)
    773         echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    774         amd64)
    775         echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    776         *)
    777         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    778     esac
     803    echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    779804    exit ;;
    780805    i*:CYGWIN*:*)
    781806    echo ${UNAME_MACHINE}-pc-cygwin
    782807    exit ;;
    783     i*:MINGW*:*)
     808    i*:MINGW*:* | i*:windows32*:*)
    784809    echo ${UNAME_MACHINE}-pc-mingw32
    785     exit ;;
    786     i*:windows32*:*)
    787         # uname -m includes "-pc" on this system.
    788         echo ${UNAME_MACHINE}-mingw32
    789810    exit ;;
    790811    i*:PW*:*)
    791812    echo ${UNAME_MACHINE}-pc-pw32
    792813    exit ;;
    793     x86:Interix*:[345]*)
    794     echo i586-pc-interix${UNAME_RELEASE}
    795     exit ;;
    796     EM64T:Interix*:[345]*)
    797     echo x86_64-unknown-interix${UNAME_RELEASE}
     814    x86:Interix*:[34]*)
     815    echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
    798816    exit ;;
    799817    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    … …  
    809827    echo ${UNAME_MACHINE}-pc-uwin
    810828    exit ;;
    811     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
     829    amd64:CYGWIN*:*:*)
    812830    echo x86_64-unknown-cygwin
    813831    exit ;;
    … …  
    866884    #endif
    867885EOF
    868     eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    869         /^CPU/{
    870         s: ::g
    871         p
    872         }'`"
     886    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    873887    test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    874888    ;;
    … …  
    889903    #endif
    890904EOF
    891     eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    892         /^CPU/{
    893         s: ::g
    894         p
    895         }'`"
     905    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    896906    test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    897907    ;;
    898     or32:Linux:*:*)
    899     echo or32-unknown-linux-gnu
    900     exit ;;
    901908    ppc:Linux:*:*)
    902909    echo powerpc-unknown-linux-gnu
    … …  
    941948    sparc:Linux:*:* | sparc64:Linux:*:*)
    942949    echo ${UNAME_MACHINE}-unknown-linux-gnu
    943     exit ;;
    944     vax:Linux:*:*)
    945     echo ${UNAME_MACHINE}-dec-linux-gnu
    946950    exit ;;
    947951    x86_64:Linux:*:*)
    … …  
    990994    # endif
    991995    #else
    992     #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
     996    #ifdef __INTEL_COMPILER
    993997    LIBC=gnu
    994998    #else
    … …  
    10001004    #endif
    10011005EOF
    1002     eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    1003         /^LIBC/{
    1004         s: ::g
    1005         p
    1006         }'`"
     1006    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    10071007    test x"${LIBC}" != x && {
    10081008        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
    … …  
    12151215    UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
    12161216    case $UNAME_PROCESSOR in
     1217        *86) UNAME_PROCESSOR=i686 ;;
    12171218        unknown) UNAME_PROCESSOR=powerpc ;;
    12181219    esac
    … …  
    12921293    i*86:skyos:*:*)
    12931294    echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
    1294     exit ;;
    1295     i*86:rdos:*:*)
    1296     echo ${UNAME_MACHINE}-pc-rdos
    12971295    exit ;;
    12981296esac
Note: See TracChangeset for help on using the changeset viewer.