← Back to branch summary

~ubuntu-branches/ubuntu/hardy/lighttpd/hardy-updates

« back to all changes in this revision

Viewing changes to config.guess

  • Committer: Bazaar Package Importer
  • Author(s): Michele Angrisano
  • Date: 2007-07-28 20:33:22 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20070728203322-ut5ym6udh0xjxkma
Tags: 1.4.16-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add fam/gamin stat cache engine support.
  - Replace Depends: on perl with Depends: on libterm-readline-perl-perl.
  - Make sure that upgrades succeed, even if we can't restart lighttpd.
  - Clean environment in init.d script.
  - Update maintainer field in debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config.guess
139
139
UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
140
140
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
141
141
 
 
142
case "${UNAME_MACHINE}" in
 
143
    i?86)
 
144
        test -z "$VENDOR" && VENDOR=pc
 
145
        ;;
 
146
    *)
 
147
        test -z "$VENDOR" && VENDOR=unknown
 
148
        ;;
 
149
esac
 
150
test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
 
151
 
142
152
# Note: order is significant - the case branches are not exclusive.
143
153
 
144
154
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
829
839
        echo ${UNAME_MACHINE}-pc-minix
830
840
        exit ;;
831
841
    arm*:Linux:*:*)
832
 
<<<<<<< .robocza
833
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
834
 
=======
835
842
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
836
 
>>>>>>> .merge-prawo.w227
837
843
        exit ;;
838
844
    avr32*:Linux:*:*)
839
845
        echo ${UNAME_MACHINE}-unknown-linux-gnu
845
851
        echo crisv32-axis-linux-gnu
846
852
        exit ;;
847
853
    frv:Linux:*:*)
848
 
<<<<<<< .robocza
849
 
        echo frv-unknown-linux-gnu
850
 
=======
851
854
        echo frv-${VENDOR}-linux-gnu
852
 
>>>>>>> .merge-prawo.w227
853
855
        exit ;;
854
856
    ia64:Linux:*:*)
855
 
<<<<<<< .robocza
856
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
857
 
=======
858
857
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
859
 
>>>>>>> .merge-prawo.w227
860
858
        exit ;;
861
859
    m32r*:Linux:*:*)
862
 
<<<<<<< .robocza
863
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
864
 
=======
865
860
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
866
 
>>>>>>> .merge-prawo.w227
867
861
        exit ;;
868
862
    m68*:Linux:*:*)
869
 
<<<<<<< .robocza
870
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
871
 
=======
872
863
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
873
 
>>>>>>> .merge-prawo.w227
874
864
        exit ;;
875
865
    mips:Linux:*:*)
876
866
        eval $set_cc_for_build
888
878
        #endif
889
879
        #endif
890
880
EOF
891
 
<<<<<<< .robocza
892
 
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
893
 
            /^CPU/{
894
 
                s: ::g
895
 
                p
896
 
            }'`"
897
 
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
898
 
=======
899
881
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
900
882
            /^CPU/{
901
883
                s: ::g
902
884
                p
903
885
            }'`"
904
886
        test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
905
 
>>>>>>> .merge-prawo.w227
906
887
        ;;
907
888
    mips64:Linux:*:*)
908
889
        eval $set_cc_for_build
920
901
        #endif
921
902
        #endif
922
903
EOF
923
 
<<<<<<< .robocza
924
 
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
925
 
            /^CPU/{
926
 
                s: ::g
927
 
                p
928
 
            }'`"
929
 
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
930
 
=======
931
904
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
932
905
            /^CPU/{
933
906
                s: ::g
934
907
                p
935
908
            }'`"
936
909
        test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
937
 
>>>>>>> .merge-prawo.w227
938
910
        ;;
939
 
<<<<<<< .robocza
940
 
    or32:Linux:*:*)
941
 
        echo or32-unknown-linux-gnu
942
 
        exit ;;
943
 
=======
944
911
    or32:Linux:*:*)
945
912
        echo or32-${VENDOR}-linux-gnu
946
913
        exit ;;
947
 
>>>>>>> .merge-prawo.w227
948
914
    ppc:Linux:*:*)
949
 
<<<<<<< .robocza
950
 
        echo powerpc-unknown-linux-gnu
951
 
=======
952
915
        echo powerpc-${VENDOR}-linux-gnu
953
 
>>>>>>> .merge-prawo.w227
954
916
        exit ;;
955
917
    ppc64:Linux:*:*)
956
 
<<<<<<< .robocza
957
 
        echo powerpc64-unknown-linux-gnu
958
 
=======
959
918
        echo powerpc64-${VENDOR}-linux-gnu
960
 
>>>>>>> .merge-prawo.w227
961
919
        exit ;;
962
920
    alpha:Linux:*:*)
963
921
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
971
929
        esac
972
930
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
973
931
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
974
 
<<<<<<< .robocza
975
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
976
 
=======
977
932
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
978
 
>>>>>>> .merge-prawo.w227
979
933
        exit ;;
980
934
    parisc:Linux:*:* | hppa:Linux:*:*)
981
935
        # Look for CPU level
982
936
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
983
 
<<<<<<< .robocza
984
 
          PA7*) echo hppa1.1-unknown-linux-gnu ;;
985
 
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
986
 
          *)    echo hppa-unknown-linux-gnu ;;
987
 
=======
988
937
          PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
989
938
          PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
990
939
          *)    echo hppa-${VENDOR}-linux-gnu ;;
991
 
>>>>>>> .merge-prawo.w227
992
940
        esac
993
941
        exit ;;
994
942
    parisc64:Linux:*:* | hppa64:Linux:*:*)
995
 
<<<<<<< .robocza
996
 
        echo hppa64-unknown-linux-gnu
997
 
=======
998
943
        echo hppa64-${VENDOR}-linux-gnu
999
 
>>>>>>> .merge-prawo.w227
1000
944
        exit ;;
1001
945
    s390:Linux:*:* | s390x:Linux:*:*)
1002
946
        echo ${UNAME_MACHINE}-ibm-linux
1003
947
        exit ;;
1004
948
    sh64*:Linux:*:*)
1005
 
<<<<<<< .robocza
1006
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
1007
 
=======
1008
949
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
1009
 
>>>>>>> .merge-prawo.w227
1010
950
        exit ;;
1011
951
    sh*:Linux:*:*)
1012
 
<<<<<<< .robocza
1013
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
1014
 
=======
1015
952
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
1016
 
>>>>>>> .merge-prawo.w227
1017
953
        exit ;;
1018
954
    sparc:Linux:*:* | sparc64:Linux:*:*)
1019
 
<<<<<<< .robocza
1020
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
1021
 
=======
1022
955
        echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
1023
 
>>>>>>> .merge-prawo.w227
1024
956
        exit ;;
1025
957
    vax:Linux:*:*)
1026
958
        echo ${UNAME_MACHINE}-dec-linux-gnu
1027
959
        exit ;;
1028
960
    x86_64:Linux:*:*)
1029
 
<<<<<<< .robocza
1030
 
        echo x86_64-unknown-linux-gnu
1031
 
=======
1032
961
        echo x86_64-${VENDOR}-linux-gnu
1033
 
>>>>>>> .merge-prawo.w227
1034
962
        exit ;;
1035
963
    i*86:Linux:*:*)
1036
964
        # The BFD linker knows what the default object file format is, so
1045
973
                                    p'`
1046
974
        case "$ld_supported_targets" in
1047
975
          elf32-i386)
1048
 
<<<<<<< .robocza
1049
 
                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
1050
 
=======
1051
976
                TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
1052
 
>>>>>>> .merge-prawo.w227
1053
977
                ;;
1054
978
          a.out-i386-linux)
1055
 
<<<<<<< .robocza
1056
 
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1057
 
=======
1058
979
                echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
1059
 
>>>>>>> .merge-prawo.w227
1060
980
                exit ;;
1061
981
          coff-i386)
1062
 
<<<<<<< .robocza
1063
 
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
1064
 
=======
1065
982
                echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
1066
 
>>>>>>> .merge-prawo.w227
1067
983
                exit ;;
1068
984
          "")
1069
985
                # Either a pre-BFD a.out linker (linux-gnuoldld) or
1070
986
                # one that does not give us useful --help.
1071
 
<<<<<<< .robocza
1072
 
                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1073
 
=======
1074
987
                echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
1075
 
>>>>>>> .merge-prawo.w227
1076
988
                exit ;;
1077
989
        esac
1078
990
        # Determine whether the default compiler is a.out or elf
1106
1018
                p
1107
1019
            }'`"
1108
1020
        test x"${LIBC}" != x && {
1109
 
<<<<<<< .robocza
1110
 
                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1111
 
=======
1112
1021
                echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
1113
 
>>>>>>> .merge-prawo.w227
1114
1022
                exit
1115
1023
        }
1116
1024
        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }