123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243 |
- --- ConsoleKit-0.4.4.orig/config.sub 2011-02-17 00:44:31.000000000 +0100
- +++ ConsoleKit-0.4.4/config.sub 2010-11-26 15:32:59.100676381 +0100
- @@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
- -timestamp='2009-11-20'
- +timestamp='2008-09-08'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
- @@ -32,16 +32,13 @@ timestamp='2009-11-20'
-
-
- # Please send patches to <config-patches@gnu.org>. Submit a context
- -# diff and a properly formatted GNU ChangeLog entry.
- +# diff and a properly formatted ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
-
- -# You can get the latest version of this script from:
- -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- -
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
- @@ -125,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- - kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- @@ -152,13 +148,10 @@ case $os in
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- - -apple | -axis | -knuth | -cray | -microblaze)
- + -apple | -axis | -knuth | -cray)
- os=
- basic_machine=$1
- ;;
- - -bluegene*)
- - os=-cnk
- - ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- @@ -251,12 +244,11 @@ case $basic_machine in
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- - | d10v | d30v | dlx | dsp16xx \
- + | d10v | d30v | dlx | dsp16xx | dvp \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- - | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- @@ -278,7 +270,6 @@ case $basic_machine in
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- - | moxie \
- | mt \
- | msp430 \
- | nios | nios2 \
- @@ -287,22 +278,20 @@ case $basic_machine in
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- - | rx \
- | score \
- - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- - | ubicom32 \
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- - m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- + m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
- os=-none
- @@ -342,10 +331,9 @@ case $basic_machine in
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- - | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- @@ -373,8 +361,8 @@ case $basic_machine in
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- - | romp-* | rs6000-* | rx-* \
- - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- + | romp-* | rs6000-* \
- + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- @@ -382,7 +370,6 @@ case $basic_machine in
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- | tron-* \
- - | ubicom32-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- @@ -456,10 +443,6 @@ case $basic_machine in
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- - aros)
- - basic_machine=i386-pc
- - os=-aros
- - ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- @@ -476,10 +459,6 @@ case $basic_machine in
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- - bluegene*)
- - basic_machine=powerpc-ibm
- - os=-cnk
- - ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- @@ -732,9 +711,6 @@ case $basic_machine in
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- - microblaze)
- - basic_machine=microblaze-xilinx
- - ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
- @@ -750,6 +726,24 @@ case $basic_machine in
- basic_machine=m68k-atari
- os=-mint
- ;;
- + mipsEE* | ee | ps2)
- + basic_machine=mips64r5900el-scei
- + case $os in
- + -linux*)
- + ;;
- + *)
- + os=-elf
- + ;;
- + esac
- + ;;
- + iop)
- + basic_machine=mipsel-scei
- + os=-irx
- + ;;
- + dvp)
- + basic_machine=dvp-scei
- + os=-elf
- + ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- @@ -1206,7 +1200,7 @@ case $basic_machine in
- we32k)
- basic_machine=we32k-att
- ;;
- - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- @@ -1256,9 +1250,6 @@ case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- - -auroraux)
- - os=-auroraux
- - ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- @@ -1279,11 +1270,10 @@ case $os in
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- - | -sym* | -kopensolaris* \
- + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- - | -aos* | -aros* \
- + | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- @@ -1302,7 +1292,7 @@ case $os in
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- @@ -1632,7 +1622,7 @@ case $basic_machine in
- -sunos*)
- vendor=sun
- ;;
- - -cnk*|-aix*)
- + -aix*)
- vendor=ibm
- ;;
- -beos*)
|