patch-config_sub 8.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243
  1. --- ConsoleKit-0.4.4.orig/config.sub 2011-02-17 00:44:31.000000000 +0100
  2. +++ ConsoleKit-0.4.4/config.sub 2010-11-26 15:32:59.100676381 +0100
  3. @@ -1,10 +1,10 @@
  4. #! /bin/sh
  5. # Configuration validation subroutine script.
  6. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  7. -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
  8. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  9. # Free Software Foundation, Inc.
  10. -timestamp='2009-11-20'
  11. +timestamp='2008-09-08'
  12. # This file is (in principle) common to ALL GNU software.
  13. # The presence of a machine in this file suggests that SOME GNU software
  14. @@ -32,16 +32,13 @@ timestamp='2009-11-20'
  15. # Please send patches to <config-patches@gnu.org>. Submit a context
  16. -# diff and a properly formatted GNU ChangeLog entry.
  17. +# diff and a properly formatted ChangeLog entry.
  18. #
  19. # Configuration subroutine to validate and canonicalize a configuration type.
  20. # Supply the specified configuration type as an argument.
  21. # If it is invalid, we print an error message on stderr and exit with code 1.
  22. # Otherwise, we print the canonical config type on stdout and succeed.
  23. -# You can get the latest version of this script from:
  24. -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
  25. -
  26. # This file is supposed to be the same for all GNU packages
  27. # and recognize all the CPU types, system types and aliases
  28. # that are meaningful with *any* GNU software.
  29. @@ -125,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
  30. case $maybe_os in
  31. nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  32. uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  33. - kopensolaris*-gnu* | \
  34. storm-chaos* | os2-emx* | rtmk-nova*)
  35. os=-$maybe_os
  36. basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
  37. @@ -152,13 +148,10 @@ case $os in
  38. -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  39. -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  40. -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
  41. - -apple | -axis | -knuth | -cray | -microblaze)
  42. + -apple | -axis | -knuth | -cray)
  43. os=
  44. basic_machine=$1
  45. ;;
  46. - -bluegene*)
  47. - os=-cnk
  48. - ;;
  49. -sim | -cisco | -oki | -wec | -winbond)
  50. os=
  51. basic_machine=$1
  52. @@ -251,12 +244,11 @@ case $basic_machine in
  53. | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  54. | bfin \
  55. | c4x | clipper \
  56. - | d10v | d30v | dlx | dsp16xx \
  57. + | d10v | d30v | dlx | dsp16xx | dvp \
  58. | fido | fr30 | frv \
  59. | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  60. | i370 | i860 | i960 | ia64 \
  61. | ip2k | iq2000 \
  62. - | lm32 \
  63. | m32c | m32r | m32rle | m68000 | m68k | m88k \
  64. | maxq | mb | microblaze | mcore | mep | metag \
  65. | mips | mipsbe | mipseb | mipsel | mipsle \
  66. @@ -278,7 +270,6 @@ case $basic_machine in
  67. | mipsisa64sr71k | mipsisa64sr71kel \
  68. | mipstx39 | mipstx39el \
  69. | mn10200 | mn10300 \
  70. - | moxie \
  71. | mt \
  72. | msp430 \
  73. | nios | nios2 \
  74. @@ -287,22 +278,20 @@ case $basic_machine in
  75. | pdp10 | pdp11 | pj | pjl \
  76. | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  77. | pyramid \
  78. - | rx \
  79. | score \
  80. - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  81. + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  82. | sh64 | sh64le \
  83. | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
  84. | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
  85. | spu | strongarm \
  86. | tahoe | thumb | tic4x | tic80 | tron \
  87. - | ubicom32 \
  88. | v850 | v850e \
  89. | we32k \
  90. | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
  91. | z8k | z80)
  92. basic_machine=$basic_machine-unknown
  93. ;;
  94. - m6811 | m68hc11 | m6812 | m68hc12 | picochip)
  95. + m6811 | m68hc11 | m6812 | m68hc12)
  96. # Motorola 68HC11/12.
  97. basic_machine=$basic_machine-unknown
  98. os=-none
  99. @@ -342,10 +331,9 @@ case $basic_machine in
  100. | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  101. | i*86-* | i860-* | i960-* | ia64-* \
  102. | ip2k-* | iq2000-* \
  103. - | lm32-* \
  104. | m32c-* | m32r-* | m32rle-* \
  105. | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
  106. - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
  107. + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
  108. | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  109. | mips16-* \
  110. | mips64-* | mips64el-* \
  111. @@ -373,8 +361,8 @@ case $basic_machine in
  112. | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  113. | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  114. | pyramid-* \
  115. - | romp-* | rs6000-* | rx-* \
  116. - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  117. + | romp-* | rs6000-* \
  118. + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  119. | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
  120. | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
  121. | sparclite-* \
  122. @@ -382,7 +370,6 @@ case $basic_machine in
  123. | tahoe-* | thumb-* \
  124. | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
  125. | tron-* \
  126. - | ubicom32-* \
  127. | v850-* | v850e-* | vax-* \
  128. | we32k-* \
  129. | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
  130. @@ -456,10 +443,6 @@ case $basic_machine in
  131. basic_machine=m68k-apollo
  132. os=-bsd
  133. ;;
  134. - aros)
  135. - basic_machine=i386-pc
  136. - os=-aros
  137. - ;;
  138. aux)
  139. basic_machine=m68k-apple
  140. os=-aux
  141. @@ -476,10 +459,6 @@ case $basic_machine in
  142. basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
  143. os=-linux
  144. ;;
  145. - bluegene*)
  146. - basic_machine=powerpc-ibm
  147. - os=-cnk
  148. - ;;
  149. c90)
  150. basic_machine=c90-cray
  151. os=-unicos
  152. @@ -732,9 +711,6 @@ case $basic_machine in
  153. basic_machine=ns32k-utek
  154. os=-sysv
  155. ;;
  156. - microblaze)
  157. - basic_machine=microblaze-xilinx
  158. - ;;
  159. mingw32)
  160. basic_machine=i386-pc
  161. os=-mingw32
  162. @@ -750,6 +726,24 @@ case $basic_machine in
  163. basic_machine=m68k-atari
  164. os=-mint
  165. ;;
  166. + mipsEE* | ee | ps2)
  167. + basic_machine=mips64r5900el-scei
  168. + case $os in
  169. + -linux*)
  170. + ;;
  171. + *)
  172. + os=-elf
  173. + ;;
  174. + esac
  175. + ;;
  176. + iop)
  177. + basic_machine=mipsel-scei
  178. + os=-irx
  179. + ;;
  180. + dvp)
  181. + basic_machine=dvp-scei
  182. + os=-elf
  183. + ;;
  184. mips3*-*)
  185. basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  186. ;;
  187. @@ -1206,7 +1200,7 @@ case $basic_machine in
  188. we32k)
  189. basic_machine=we32k-att
  190. ;;
  191. - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
  192. + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
  193. basic_machine=sh-unknown
  194. ;;
  195. sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
  196. @@ -1256,9 +1250,6 @@ case $os in
  197. # First match some system type aliases
  198. # that might get confused with valid system types.
  199. # -solaris* is a basic system type, with this one exception.
  200. - -auroraux)
  201. - os=-auroraux
  202. - ;;
  203. -solaris1 | -solaris1.*)
  204. os=`echo $os | sed -e 's|solaris1|sunos4|'`
  205. ;;
  206. @@ -1279,11 +1270,10 @@ case $os in
  207. # Each alternative MUST END IN A *, to match a version number.
  208. # -sysv* is not here because it comes later, after sysvr4.
  209. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
  210. - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
  211. - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
  212. - | -sym* | -kopensolaris* \
  213. + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
  214. + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  215. | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  216. - | -aos* | -aros* \
  217. + | -aos* \
  218. | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  219. | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  220. | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
  221. @@ -1302,7 +1292,7 @@ case $os in
  222. | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  223. | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  224. | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
  225. - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  226. + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
  227. # Remember, each alternative MUST END IN *, to match a version number.
  228. ;;
  229. -qnx*)
  230. @@ -1632,7 +1622,7 @@ case $basic_machine in
  231. -sunos*)
  232. vendor=sun
  233. ;;
  234. - -cnk*|-aix*)
  235. + -aix*)
  236. vendor=ibm
  237. ;;
  238. -beos*)