patch-build-aux_config_guess 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447
  1. --- libsoup-2.44.2.orig/build-aux/config.guess 2013-10-18 00:01:48.000000000 +0200
  2. +++ libsoup-2.44.2/build-aux/config.guess 2014-04-14 17:21:42.176934834 +0200
  3. @@ -1,10 +1,8 @@
  4. #! /bin/sh
  5. # Attempt to guess a canonical system name.
  6. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  7. -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
  8. -# 2011, 2012, 2013 Free Software Foundation, Inc.
  9. +# Copyright 1992-2014 Free Software Foundation, Inc.
  10. -timestamp='2012-12-29'
  11. +timestamp='2014-01-25'
  12. # This file is free software; you can redistribute it and/or modify it
  13. # under the terms of the GNU General Public License as published by
  14. @@ -26,7 +24,7 @@ timestamp='2012-12-29'
  15. # program. This Exception is an additional permission under section 7
  16. # of the GNU General Public License, version 3 ("GPLv3").
  17. #
  18. -# Originally written by Per Bothner.
  19. +# Originally written by Per Bothner.
  20. #
  21. # You can get the latest version of this script from:
  22. # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
  23. @@ -52,9 +50,7 @@ version="\
  24. GNU config.guess ($timestamp)
  25. Originally written by Per Bothner.
  26. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  27. -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
  28. -2012, 2013 Free Software Foundation, Inc.
  29. +Copyright 1992-2014 Free Software Foundation, Inc.
  30. This is free software; see the source for copying conditions. There is NO
  31. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  32. @@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
  33. UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  34. UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  35. +case "${UNAME_SYSTEM}" in
  36. +Linux|GNU|GNU/*)
  37. + # If the system lacks a compiler, then just pick glibc.
  38. + # We could probably try harder.
  39. + LIBC=gnu
  40. +
  41. + eval $set_cc_for_build
  42. + cat <<-EOF > $dummy.c
  43. + #include <features.h>
  44. + #if defined(__UCLIBC__)
  45. + LIBC=uclibc
  46. + #elif defined(__dietlibc__)
  47. + LIBC=dietlibc
  48. + #else
  49. + LIBC=gnu
  50. + #endif
  51. + EOF
  52. + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
  53. + ;;
  54. +esac
  55. +
  56. # Note: order is significant - the case branches are not exclusive.
  57. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  58. @@ -857,21 +874,21 @@ EOF
  59. exit ;;
  60. *:GNU:*:*)
  61. # the GNU system
  62. - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  63. + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  64. exit ;;
  65. *:GNU/*:*:*)
  66. # other systems with GNU libc and userland
  67. - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
  68. + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
  69. exit ;;
  70. i*86:Minix:*:*)
  71. echo ${UNAME_MACHINE}-pc-minix
  72. exit ;;
  73. aarch64:Linux:*:*)
  74. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  75. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  76. exit ;;
  77. aarch64_be:Linux:*:*)
  78. UNAME_MACHINE=aarch64_be
  79. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  80. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  81. exit ;;
  82. alpha:Linux:*:*)
  83. case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  84. @@ -884,59 +901,54 @@ EOF
  85. EV68*) UNAME_MACHINE=alphaev68 ;;
  86. esac
  87. objdump --private-headers /bin/sh | grep -q ld.so.1
  88. - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  89. - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
  90. + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
  91. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  92. + exit ;;
  93. + arc:Linux:*:* | arceb:Linux:*:*)
  94. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  95. exit ;;
  96. arm*:Linux:*:*)
  97. eval $set_cc_for_build
  98. if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  99. | grep -q __ARM_EABI__
  100. then
  101. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  102. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  103. else
  104. if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
  105. | grep -q __ARM_PCS_VFP
  106. then
  107. - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
  108. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
  109. else
  110. - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
  111. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
  112. fi
  113. fi
  114. exit ;;
  115. avr32*:Linux:*:*)
  116. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  117. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  118. exit ;;
  119. cris:Linux:*:*)
  120. - echo ${UNAME_MACHINE}-axis-linux-gnu
  121. + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  122. exit ;;
  123. crisv32:Linux:*:*)
  124. - echo ${UNAME_MACHINE}-axis-linux-gnu
  125. + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  126. exit ;;
  127. frv:Linux:*:*)
  128. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  129. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  130. exit ;;
  131. hexagon:Linux:*:*)
  132. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  133. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  134. exit ;;
  135. i*86:Linux:*:*)
  136. - LIBC=gnu
  137. - eval $set_cc_for_build
  138. - sed 's/^ //' << EOF >$dummy.c
  139. - #ifdef __dietlibc__
  140. - LIBC=dietlibc
  141. - #endif
  142. -EOF
  143. - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
  144. - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  145. + echo ${UNAME_MACHINE}-pc-linux-${LIBC}
  146. exit ;;
  147. ia64:Linux:*:*)
  148. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  149. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  150. exit ;;
  151. m32r*:Linux:*:*)
  152. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  153. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  154. exit ;;
  155. m68*:Linux:*:*)
  156. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  157. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  158. exit ;;
  159. mips:Linux:*:* | mips64:Linux:*:*)
  160. eval $set_cc_for_build
  161. @@ -955,54 +967,63 @@ EOF
  162. #endif
  163. EOF
  164. eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
  165. - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  166. + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  167. ;;
  168. + or1k:Linux:*:*)
  169. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  170. + exit ;;
  171. or32:Linux:*:*)
  172. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  173. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  174. exit ;;
  175. padre:Linux:*:*)
  176. - echo sparc-unknown-linux-gnu
  177. + echo sparc-unknown-linux-${LIBC}
  178. exit ;;
  179. parisc64:Linux:*:* | hppa64:Linux:*:*)
  180. - echo hppa64-unknown-linux-gnu
  181. + echo hppa64-unknown-linux-${LIBC}
  182. exit ;;
  183. parisc:Linux:*:* | hppa:Linux:*:*)
  184. # Look for CPU level
  185. case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
  186. - PA7*) echo hppa1.1-unknown-linux-gnu ;;
  187. - PA8*) echo hppa2.0-unknown-linux-gnu ;;
  188. - *) echo hppa-unknown-linux-gnu ;;
  189. + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
  190. + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
  191. + *) echo hppa-unknown-linux-${LIBC} ;;
  192. esac
  193. exit ;;
  194. ppc64:Linux:*:*)
  195. - echo powerpc64-unknown-linux-gnu
  196. + echo powerpc64-unknown-linux-${LIBC}
  197. exit ;;
  198. ppc:Linux:*:*)
  199. - echo powerpc-unknown-linux-gnu
  200. + echo powerpc-unknown-linux-${LIBC}
  201. + exit ;;
  202. + ppc64le:Linux:*:*)
  203. + echo powerpc64le-unknown-linux-${LIBC}
  204. + exit ;;
  205. + ppcle:Linux:*:*)
  206. + echo powerpcle-unknown-linux-${LIBC}
  207. exit ;;
  208. s390:Linux:*:* | s390x:Linux:*:*)
  209. - echo ${UNAME_MACHINE}-ibm-linux
  210. + echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
  211. exit ;;
  212. sh64*:Linux:*:*)
  213. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  214. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  215. exit ;;
  216. sh*:Linux:*:*)
  217. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  218. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  219. exit ;;
  220. sparc:Linux:*:* | sparc64:Linux:*:*)
  221. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  222. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  223. exit ;;
  224. tile*:Linux:*:*)
  225. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  226. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  227. exit ;;
  228. vax:Linux:*:*)
  229. - echo ${UNAME_MACHINE}-dec-linux-gnu
  230. + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
  231. exit ;;
  232. x86_64:Linux:*:*)
  233. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  234. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  235. exit ;;
  236. xtensa*:Linux:*:*)
  237. - echo ${UNAME_MACHINE}-unknown-linux-gnu
  238. + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  239. exit ;;
  240. i*86:DYNIX/ptx:4*:*)
  241. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
  242. @@ -1235,19 +1256,31 @@ EOF
  243. exit ;;
  244. *:Darwin:*:*)
  245. UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  246. - case $UNAME_PROCESSOR in
  247. - i386)
  248. - eval $set_cc_for_build
  249. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
  250. - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
  251. - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
  252. - grep IS_64BIT_ARCH >/dev/null
  253. - then
  254. - UNAME_PROCESSOR="x86_64"
  255. - fi
  256. - fi ;;
  257. - unknown) UNAME_PROCESSOR=powerpc ;;
  258. - esac
  259. + eval $set_cc_for_build
  260. + if test "$UNAME_PROCESSOR" = unknown ; then
  261. + UNAME_PROCESSOR=powerpc
  262. + fi
  263. + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
  264. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
  265. + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
  266. + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
  267. + grep IS_64BIT_ARCH >/dev/null
  268. + then
  269. + case $UNAME_PROCESSOR in
  270. + i386) UNAME_PROCESSOR=x86_64 ;;
  271. + powerpc) UNAME_PROCESSOR=powerpc64 ;;
  272. + esac
  273. + fi
  274. + fi
  275. + elif test "$UNAME_PROCESSOR" = i386 ; then
  276. + # Avoid executing cc on OS X 10.9, as it ships with a stub
  277. + # that puts up a graphical alert prompting to install
  278. + # developer tools. Any system running Mac OS X 10.7 or
  279. + # later (Darwin 11 and later) is required to have a 64-bit
  280. + # processor. This is not true of the ARM version of Darwin
  281. + # that Apple uses in portable devices.
  282. + UNAME_PROCESSOR=x86_64
  283. + fi
  284. echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  285. exit ;;
  286. *:procnto*:*:* | *:QNX:[0123456789]*:*)
  287. @@ -1338,154 +1371,6 @@ EOF
  288. exit ;;
  289. esac
  290. -eval $set_cc_for_build
  291. -cat >$dummy.c <<EOF
  292. -#ifdef _SEQUENT_
  293. -# include <sys/types.h>
  294. -# include <sys/utsname.h>
  295. -#endif
  296. -main ()
  297. -{
  298. -#if defined (sony)
  299. -#if defined (MIPSEB)
  300. - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
  301. - I don't know.... */
  302. - printf ("mips-sony-bsd\n"); exit (0);
  303. -#else
  304. -#include <sys/param.h>
  305. - printf ("m68k-sony-newsos%s\n",
  306. -#ifdef NEWSOS4
  307. - "4"
  308. -#else
  309. - ""
  310. -#endif
  311. - ); exit (0);
  312. -#endif
  313. -#endif
  314. -
  315. -#if defined (__arm) && defined (__acorn) && defined (__unix)
  316. - printf ("arm-acorn-riscix\n"); exit (0);
  317. -#endif
  318. -
  319. -#if defined (hp300) && !defined (hpux)
  320. - printf ("m68k-hp-bsd\n"); exit (0);
  321. -#endif
  322. -
  323. -#if defined (NeXT)
  324. -#if !defined (__ARCHITECTURE__)
  325. -#define __ARCHITECTURE__ "m68k"
  326. -#endif
  327. - int version;
  328. - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  329. - if (version < 4)
  330. - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  331. - else
  332. - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  333. - exit (0);
  334. -#endif
  335. -
  336. -#if defined (MULTIMAX) || defined (n16)
  337. -#if defined (UMAXV)
  338. - printf ("ns32k-encore-sysv\n"); exit (0);
  339. -#else
  340. -#if defined (CMU)
  341. - printf ("ns32k-encore-mach\n"); exit (0);
  342. -#else
  343. - printf ("ns32k-encore-bsd\n"); exit (0);
  344. -#endif
  345. -#endif
  346. -#endif
  347. -
  348. -#if defined (__386BSD__)
  349. - printf ("i386-pc-bsd\n"); exit (0);
  350. -#endif
  351. -
  352. -#if defined (sequent)
  353. -#if defined (i386)
  354. - printf ("i386-sequent-dynix\n"); exit (0);
  355. -#endif
  356. -#if defined (ns32000)
  357. - printf ("ns32k-sequent-dynix\n"); exit (0);
  358. -#endif
  359. -#endif
  360. -
  361. -#if defined (_SEQUENT_)
  362. - struct utsname un;
  363. -
  364. - uname(&un);
  365. -
  366. - if (strncmp(un.version, "V2", 2) == 0) {
  367. - printf ("i386-sequent-ptx2\n"); exit (0);
  368. - }
  369. - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
  370. - printf ("i386-sequent-ptx1\n"); exit (0);
  371. - }
  372. - printf ("i386-sequent-ptx\n"); exit (0);
  373. -
  374. -#endif
  375. -
  376. -#if defined (vax)
  377. -# if !defined (ultrix)
  378. -# include <sys/param.h>
  379. -# if defined (BSD)
  380. -# if BSD == 43
  381. - printf ("vax-dec-bsd4.3\n"); exit (0);
  382. -# else
  383. -# if BSD == 199006
  384. - printf ("vax-dec-bsd4.3reno\n"); exit (0);
  385. -# else
  386. - printf ("vax-dec-bsd\n"); exit (0);
  387. -# endif
  388. -# endif
  389. -# else
  390. - printf ("vax-dec-bsd\n"); exit (0);
  391. -# endif
  392. -# else
  393. - printf ("vax-dec-ultrix\n"); exit (0);
  394. -# endif
  395. -#endif
  396. -
  397. -#if defined (alliant) && defined (i860)
  398. - printf ("i860-alliant-bsd\n"); exit (0);
  399. -#endif
  400. -
  401. - exit (1);
  402. -}
  403. -EOF
  404. -
  405. -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
  406. - { echo "$SYSTEM_NAME"; exit; }
  407. -
  408. -# Apollos put the system type in the environment.
  409. -
  410. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
  411. -
  412. -# Convex versions that predate uname can use getsysinfo(1)
  413. -
  414. -if [ -x /usr/convex/getsysinfo ]
  415. -then
  416. - case `getsysinfo -f cpu_type` in
  417. - c1*)
  418. - echo c1-convex-bsd
  419. - exit ;;
  420. - c2*)
  421. - if getsysinfo -f scalar_acc
  422. - then echo c32-convex-bsd
  423. - else echo c2-convex-bsd
  424. - fi
  425. - exit ;;
  426. - c34*)
  427. - echo c34-convex-bsd
  428. - exit ;;
  429. - c38*)
  430. - echo c38-convex-bsd
  431. - exit ;;
  432. - c4*)
  433. - echo c4-convex-bsd
  434. - exit ;;
  435. - esac
  436. -fi
  437. -
  438. cat >&2 <<EOF
  439. $0: unable to guess system type