patch-config_guess 6.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- libtirpc-0.2.0.orig/config.guess 2008-08-30 00:27:25.000000000 +0200
  3. +++ libtirpc-0.2.0/config.guess 2009-05-29 20:19:07.987037575 +0200
  4. @@ -4,7 +4,7 @@
  5. # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  6. # Free Software Foundation, Inc.
  7. -timestamp='2008-01-23'
  8. +timestamp='2008-09-28'
  9. # This file is free software; you can redistribute it and/or modify it
  10. # under the terms of the GNU General Public License as published by
  11. @@ -139,6 +139,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
  12. UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  13. UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  14. +if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
  15. + eval $set_cc_for_build
  16. + cat << EOF > $dummy.c
  17. + #include <features.h>
  18. + #ifdef __UCLIBC__
  19. + # ifdef __UCLIBC_CONFIG_VERSION__
  20. + LIBC=uclibc __UCLIBC_CONFIG_VERSION__
  21. + # else
  22. + LIBC=uclibc
  23. + # endif
  24. + #else
  25. + LIBC=gnu
  26. + #endif
  27. +EOF
  28. + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
  29. +fi
  30. +
  31. # Note: order is significant - the case branches are not exclusive.
  32. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  33. @@ -796,7 +813,7 @@ EOF
  34. x86)
  35. echo i586-pc-interix${UNAME_RELEASE}
  36. exit ;;
  37. - EM64T | authenticamd)
  38. + EM64T | authenticamd | genuineintel)
  39. echo x86_64-unknown-interix${UNAME_RELEASE}
  40. exit ;;
  41. IA64)
  42. @@ -840,31 +857,31 @@ EOF
  43. if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  44. | grep -q __ARM_EABI__
  45. then
  46. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  47. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  48. else
  49. - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
  50. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
  51. fi
  52. exit ;;
  53. avr32*:Linux:*:*)
  54. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  55. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  56. exit ;;
  57. cris:Linux:*:*)
  58. - echo cris-axis-linux-gnu
  59. + echo cris-axis-linux-${LIBC}
  60. exit ;;
  61. crisv32:Linux:*:*)
  62. - echo crisv32-axis-linux-gnu
  63. + echo crisv32-axis-linux-${LIBC}
  64. exit ;;
  65. frv:Linux:*:*)
  66. - echo frv-unknown-linux-gnu
  67. + echo frv-unknown-linux-${LIBC}
  68. exit ;;
  69. ia64:Linux:*:*)
  70. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  71. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  72. exit ;;
  73. m32r*:Linux:*:*)
  74. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  75. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  76. exit ;;
  77. m68*:Linux:*:*)
  78. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  79. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  80. exit ;;
  81. mips:Linux:*:*)
  82. eval $set_cc_for_build
  83. @@ -887,7 +904,7 @@ EOF
  84. s: ::g
  85. p
  86. }'`"
  87. - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  88. + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  89. ;;
  90. mips64:Linux:*:*)
  91. eval $set_cc_for_build
  92. @@ -910,16 +927,16 @@ EOF
  93. s: ::g
  94. p
  95. }'`"
  96. - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  97. + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  98. ;;
  99. or32:Linux:*:*)
  100. - echo or32-unknown-linux-gnu
  101. + echo or32-unknown-linux-${LIBC}
  102. exit ;;
  103. ppc:Linux:*:*)
  104. - echo powerpc-unknown-linux-gnu
  105. + echo powerpc-unknown-linux-${LIBC}
  106. exit ;;
  107. ppc64:Linux:*:*)
  108. - echo powerpc64-unknown-linux-gnu
  109. + echo powerpc64-unknown-linux-${LIBC}
  110. exit ;;
  111. alpha:Linux:*:*)
  112. case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  113. @@ -932,40 +949,43 @@ EOF
  114. EV68*) UNAME_MACHINE=alphaev68 ;;
  115. esac
  116. objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  117. - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  118. - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
  119. + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
  120. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  121. + exit ;;
  122. + padre:Linux:*:*)
  123. + echo sparc-unknown-linux-gnu
  124. exit ;;
  125. parisc:Linux:*:* | hppa:Linux:*:*)
  126. # Look for CPU level
  127. case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
  128. - PA7*) echo hppa1.1-unknown-linux-gnu ;;
  129. - PA8*) echo hppa2.0-unknown-linux-gnu ;;
  130. - *) echo hppa-unknown-linux-gnu ;;
  131. + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
  132. + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
  133. + *) echo hppa-unknown-linux-${LIBC} ;;
  134. esac
  135. exit ;;
  136. parisc64:Linux:*:* | hppa64:Linux:*:*)
  137. - echo hppa64-unknown-linux-gnu
  138. + echo hppa64-unknown-linux-${LIBC}
  139. exit ;;
  140. s390:Linux:*:* | s390x:Linux:*:*)
  141. echo ${UNAME_MACHINE}-ibm-linux
  142. exit ;;
  143. sh64*:Linux:*:*)
  144. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  145. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  146. exit ;;
  147. sh*:Linux:*:*)
  148. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  149. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  150. exit ;;
  151. sparc:Linux:*:* | sparc64:Linux:*:*)
  152. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  153. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  154. exit ;;
  155. vax:Linux:*:*)
  156. - echo ${UNAME_MACHINE}-dec-linux-gnu
  157. + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
  158. exit ;;
  159. x86_64:Linux:*:*)
  160. - echo x86_64-unknown-linux-gnu
  161. + echo x86_64-unknown-linux-${LIBC}
  162. exit ;;
  163. xtensa*:Linux:*:*)
  164. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  165. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  166. exit ;;
  167. i*86:Linux:*:*)
  168. # The BFD linker knows what the default object file format is, so
  169. @@ -980,20 +1000,19 @@ EOF
  170. p'`
  171. case "$ld_supported_targets" in
  172. elf32-i386)
  173. - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  174. + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
  175. ;;
  176. a.out-i386-linux)
  177. - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
  178. - exit ;;
  179. - coff-i386)
  180. - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
  181. + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
  182. exit ;;
  183. "")
  184. # Either a pre-BFD a.out linker (linux-gnuoldld) or
  185. # one that does not give us useful --help.
  186. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
  187. + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
  188. exit ;;
  189. esac
  190. + # This should get integrated into the C code below, but now we hack
  191. + if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
  192. # Determine whether the default compiler is a.out or elf
  193. eval $set_cc_for_build
  194. sed 's/^ //' << EOF >$dummy.c
  195. @@ -1216,6 +1235,9 @@ EOF
  196. BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
  197. echo i586-pc-beos
  198. exit ;;
  199. + BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
  200. + echo i586-pc-haiku
  201. + exit ;;
  202. SX-4:SUPER-UX:*:*)
  203. echo sx4-nec-superux${UNAME_RELEASE}
  204. exit ;;