123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447 |
- --- libsoup-2.44.2.orig/build-aux/config.guess 2013-10-18 00:01:48.000000000 +0200
- +++ libsoup-2.44.2/build-aux/config.guess 2014-04-14 17:21:42.176934834 +0200
- @@ -1,10 +1,8 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- -# 2011, 2012, 2013 Free Software Foundation, Inc.
- +# Copyright 1992-2014 Free Software Foundation, Inc.
-
- -timestamp='2012-12-29'
- +timestamp='2014-01-25'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
- @@ -26,7 +24,7 @@ timestamp='2012-12-29'
- # program. This Exception is an additional permission under section 7
- # of the GNU General Public License, version 3 ("GPLv3").
- #
- -# Originally written by Per Bothner.
- +# Originally written by Per Bothner.
- #
- # You can get the latest version of this script from:
- # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- @@ -52,9 +50,7 @@ version="\
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
- -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- -2012, 2013 Free Software Foundation, Inc.
- +Copyright 1992-2014 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- @@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
- +case "${UNAME_SYSTEM}" in
- +Linux|GNU|GNU/*)
- + # If the system lacks a compiler, then just pick glibc.
- + # We could probably try harder.
- + LIBC=gnu
- +
- + eval $set_cc_for_build
- + cat <<-EOF > $dummy.c
- + #include <features.h>
- + #if defined(__UCLIBC__)
- + LIBC=uclibc
- + #elif defined(__dietlibc__)
- + LIBC=dietlibc
- + #else
- + LIBC=gnu
- + #endif
- + EOF
- + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- + ;;
- +esac
- +
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- @@ -857,21 +874,21 @@ EOF
- exit ;;
- *:GNU:*:*)
- # the GNU system
- - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- aarch64:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- aarch64_be:Linux:*:*)
- UNAME_MACHINE=aarch64_be
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- @@ -884,59 +901,54 @@ EOF
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
- - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- + exit ;;
- + arc:Linux:*:* | arceb:Linux:*:*)
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
- - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
- else
- - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
- fi
- fi
- exit ;;
- avr32*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- cris:Linux:*:*)
- - echo ${UNAME_MACHINE}-axis-linux-gnu
- + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- crisv32:Linux:*:*)
- - echo ${UNAME_MACHINE}-axis-linux-gnu
- + echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- frv:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- hexagon:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:Linux:*:*)
- - LIBC=gnu
- - eval $set_cc_for_build
- - sed 's/^ //' << EOF >$dummy.c
- - #ifdef __dietlibc__
- - LIBC=dietlibc
- - #endif
- -EOF
- - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- + echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- exit ;;
- ia64:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m32r*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m68*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- @@ -955,54 +967,63 @@ EOF
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- ;;
- + or1k:Linux:*:*)
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- + exit ;;
- or32:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- padre:Linux:*:*)
- - echo sparc-unknown-linux-gnu
- + echo sparc-unknown-linux-${LIBC}
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- - echo hppa64-unknown-linux-gnu
- + echo hppa64-unknown-linux-${LIBC}
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- - PA7*) echo hppa1.1-unknown-linux-gnu ;;
- - PA8*) echo hppa2.0-unknown-linux-gnu ;;
- - *) echo hppa-unknown-linux-gnu ;;
- + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- + *) echo hppa-unknown-linux-${LIBC} ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
- - echo powerpc64-unknown-linux-gnu
- + echo powerpc64-unknown-linux-${LIBC}
- exit ;;
- ppc:Linux:*:*)
- - echo powerpc-unknown-linux-gnu
- + echo powerpc-unknown-linux-${LIBC}
- + exit ;;
- + ppc64le:Linux:*:*)
- + echo powerpc64le-unknown-linux-${LIBC}
- + exit ;;
- + ppcle:Linux:*:*)
- + echo powerpcle-unknown-linux-${LIBC}
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- - echo ${UNAME_MACHINE}-ibm-linux
- + echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
- exit ;;
- sh64*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sh*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- tile*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- vax:Linux:*:*)
- - echo ${UNAME_MACHINE}-dec-linux-gnu
- + echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- exit ;;
- x86_64:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- xtensa*:Linux:*:*)
- - echo ${UNAME_MACHINE}-unknown-linux-gnu
- + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- @@ -1235,19 +1256,31 @@ EOF
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- - case $UNAME_PROCESSOR in
- - i386)
- - eval $set_cc_for_build
- - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- - grep IS_64BIT_ARCH >/dev/null
- - then
- - UNAME_PROCESSOR="x86_64"
- - fi
- - fi ;;
- - unknown) UNAME_PROCESSOR=powerpc ;;
- - esac
- + eval $set_cc_for_build
- + if test "$UNAME_PROCESSOR" = unknown ; then
- + UNAME_PROCESSOR=powerpc
- + fi
- + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- + grep IS_64BIT_ARCH >/dev/null
- + then
- + case $UNAME_PROCESSOR in
- + i386) UNAME_PROCESSOR=x86_64 ;;
- + powerpc) UNAME_PROCESSOR=powerpc64 ;;
- + esac
- + fi
- + fi
- + elif test "$UNAME_PROCESSOR" = i386 ; then
- + # Avoid executing cc on OS X 10.9, as it ships with a stub
- + # that puts up a graphical alert prompting to install
- + # developer tools. Any system running Mac OS X 10.7 or
- + # later (Darwin 11 and later) is required to have a 64-bit
- + # processor. This is not true of the ARM version of Darwin
- + # that Apple uses in portable devices.
- + UNAME_PROCESSOR=x86_64
- + fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- @@ -1338,154 +1371,6 @@ EOF
- exit ;;
- esac
-
- -eval $set_cc_for_build
- -cat >$dummy.c <<EOF
- -#ifdef _SEQUENT_
- -# include <sys/types.h>
- -# include <sys/utsname.h>
- -#endif
- -main ()
- -{
- -#if defined (sony)
- -#if defined (MIPSEB)
- - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- - I don't know.... */
- - printf ("mips-sony-bsd\n"); exit (0);
- -#else
- -#include <sys/param.h>
- - printf ("m68k-sony-newsos%s\n",
- -#ifdef NEWSOS4
- - "4"
- -#else
- - ""
- -#endif
- - ); exit (0);
- -#endif
- -#endif
- -
- -#if defined (__arm) && defined (__acorn) && defined (__unix)
- - printf ("arm-acorn-riscix\n"); exit (0);
- -#endif
- -
- -#if defined (hp300) && !defined (hpux)
- - printf ("m68k-hp-bsd\n"); exit (0);
- -#endif
- -
- -#if defined (NeXT)
- -#if !defined (__ARCHITECTURE__)
- -#define __ARCHITECTURE__ "m68k"
- -#endif
- - int version;
- - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- - if (version < 4)
- - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- - else
- - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- - exit (0);
- -#endif
- -
- -#if defined (MULTIMAX) || defined (n16)
- -#if defined (UMAXV)
- - printf ("ns32k-encore-sysv\n"); exit (0);
- -#else
- -#if defined (CMU)
- - printf ("ns32k-encore-mach\n"); exit (0);
- -#else
- - printf ("ns32k-encore-bsd\n"); exit (0);
- -#endif
- -#endif
- -#endif
- -
- -#if defined (__386BSD__)
- - printf ("i386-pc-bsd\n"); exit (0);
- -#endif
- -
- -#if defined (sequent)
- -#if defined (i386)
- - printf ("i386-sequent-dynix\n"); exit (0);
- -#endif
- -#if defined (ns32000)
- - printf ("ns32k-sequent-dynix\n"); exit (0);
- -#endif
- -#endif
- -
- -#if defined (_SEQUENT_)
- - struct utsname un;
- -
- - uname(&un);
- -
- - if (strncmp(un.version, "V2", 2) == 0) {
- - printf ("i386-sequent-ptx2\n"); exit (0);
- - }
- - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- - printf ("i386-sequent-ptx1\n"); exit (0);
- - }
- - printf ("i386-sequent-ptx\n"); exit (0);
- -
- -#endif
- -
- -#if defined (vax)
- -# if !defined (ultrix)
- -# include <sys/param.h>
- -# if defined (BSD)
- -# if BSD == 43
- - printf ("vax-dec-bsd4.3\n"); exit (0);
- -# else
- -# if BSD == 199006
- - printf ("vax-dec-bsd4.3reno\n"); exit (0);
- -# else
- - printf ("vax-dec-bsd\n"); exit (0);
- -# endif
- -# endif
- -# else
- - printf ("vax-dec-bsd\n"); exit (0);
- -# endif
- -# else
- - printf ("vax-dec-ultrix\n"); exit (0);
- -# endif
- -#endif
- -
- -#if defined (alliant) && defined (i860)
- - printf ("i860-alliant-bsd\n"); exit (0);
- -#endif
- -
- - exit (1);
- -}
- -EOF
- -
- -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- - { echo "$SYSTEM_NAME"; exit; }
- -
- -# Apollos put the system type in the environment.
- -
- -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- -
- -# Convex versions that predate uname can use getsysinfo(1)
- -
- -if [ -x /usr/convex/getsysinfo ]
- -then
- - case `getsysinfo -f cpu_type` in
- - c1*)
- - echo c1-convex-bsd
- - exit ;;
- - c2*)
- - if getsysinfo -f scalar_acc
- - then echo c32-convex-bsd
- - else echo c2-convex-bsd
- - fi
- - exit ;;
- - c34*)
- - echo c34-convex-bsd
- - exit ;;
- - c38*)
- - echo c38-convex-bsd
- - exit ;;
- - c4*)
- - echo c4-convex-bsd
- - exit ;;
- - esac
- -fi
- -
- cat >&2 <<EOF
- $0: unable to guess system type
-
|