alexk / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone
648606
--- rpm-4.11.3/config.guess.orig	2012-11-07 13:55:52.000000000 +0100
648606
+++ rpm-4.11.3/config.guess	2013-12-27 18:11:24.000000000 +0100
648606
@@ -1,14 +1,12 @@
648606
 #! /bin/sh
648606
 # Attempt to guess a canonical system name.
648606
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
648606
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
648606
-#   2011, 2012 Free Software Foundation, Inc.
648606
+#   Copyright 1992-2013 Free Software Foundation, Inc.
648606
 
648606
-timestamp='2012-02-10'
648606
+timestamp='2013-06-10'
648606
 
648606
 # This file is free software; you can redistribute it and/or modify it
648606
 # under the terms of the GNU General Public License as published by
648606
-# the Free Software Foundation; either version 2 of the License, or
648606
+# the Free Software Foundation; either version 3 of the License, or
648606
 # (at your option) any later version.
648606
 #
648606
 # This program is distributed in the hope that it will be useful, but
648606
@@ -22,19 +20,17 @@
648606
 # As a special exception to the GNU General Public License, if you
648606
 # distribute this file as part of a program that contains a
648606
 # configuration script generated by Autoconf, you may include it under
648606
-# the same distribution terms that you use for the rest of that program.
648606
-
648606
-
648606
-# Originally written by Per Bothner.  Please send patches (context
648606
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
648606
-# entry.
648606
+# the same distribution terms that you use for the rest of that
648606
+# program.  This Exception is an additional permission under section 7
648606
+# of the GNU General Public License, version 3 ("GPLv3").
648606
 #
648606
-# This script attempts to guess a canonical system name similar to
648606
-# config.sub.  If it succeeds, it prints the system name on stdout, and
648606
-# exits with 0.  Otherwise, it exits with 1.
648606
+# Originally written by Per Bothner.
648606
 #
648606
 # You can get the latest version of this script from:
648606
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
648606
+#
648606
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
648606
+
648606
 
648606
 me=`echo "$0" | sed -e 's,.*/,,'`
648606
 
648606
@@ -54,9 +50,7 @@
648606
 GNU config.guess ($timestamp)
648606
 
648606
 Originally written by Per Bothner.
648606
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
648606
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
648606
-Free Software Foundation, Inc.
648606
+Copyright 1992-2013 Free Software Foundation, Inc.
648606
 
648606
 This is free software; see the source for copying conditions.  There is NO
648606
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
648606
@@ -138,6 +132,27 @@
648606
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
648606
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
648606
 
648606
+case "${UNAME_SYSTEM}" in
648606
+Linux|GNU|GNU/*)
648606
+	# If the system lacks a compiler, then just pick glibc.
648606
+	# We could probably try harder.
648606
+	LIBC=gnu
648606
+
648606
+	eval $set_cc_for_build
648606
+	cat <<-EOF > $dummy.c
648606
+	#include <features.h>
648606
+	#if defined(__UCLIBC__)
648606
+	LIBC=uclibc
648606
+	#elif defined(__dietlibc__)
648606
+	LIBC=dietlibc
648606
+	#else
648606
+	LIBC=gnu
648606
+	#endif
648606
+	EOF
648606
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
648606
+	;;
648606
+esac
648606
+
648606
 # Note: order is significant - the case branches are not exclusive.
648606
 
648606
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
648606
@@ -200,6 +215,10 @@
648606
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
648606
 	echo "${machine}-${os}${release}"
648606
 	exit ;;
648606
+    *:Bitrig:*:*)
648606
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
648606
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
648606
+	exit ;;
648606
     *:OpenBSD:*:*)
648606
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
648606
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
648606
@@ -302,7 +321,7 @@
648606
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
648606
 	echo arm-acorn-riscix${UNAME_RELEASE}
648606
 	exit ;;
648606
-    arm:riscos:*:*|arm:RISCOS:*:*)
648606
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
648606
 	echo arm-unknown-riscos
648606
 	exit ;;
648606
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
648606
@@ -801,6 +820,9 @@
648606
     i*:CYGWIN*:*)
648606
 	echo ${UNAME_MACHINE}-pc-cygwin
648606
 	exit ;;
648606
+    *:MINGW64*:*)
648606
+	echo ${UNAME_MACHINE}-pc-mingw64
648606
+	exit ;;
648606
     *:MINGW*:*)
648606
 	echo ${UNAME_MACHINE}-pc-mingw32
648606
 	exit ;;
648606
@@ -852,21 +874,21 @@
648606
 	exit ;;
648606
     *:GNU:*:*)
648606
 	# the GNU system
648606
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
648606
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
648606
 	exit ;;
648606
     *:GNU/*:*:*)
648606
 	# other systems with GNU libc and userland
648606
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
648606
 	exit ;;
648606
     i*86:Minix:*:*)
648606
 	echo ${UNAME_MACHINE}-pc-minix
648606
 	exit ;;
648606
     aarch64:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     aarch64_be:Linux:*:*)
648606
 	UNAME_MACHINE=aarch64_be
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     alpha:Linux:*:*)
648606
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
648606
@@ -879,59 +901,54 @@
648606
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
648606
 	esac
648606
 	objdump --private-headers /bin/sh | grep -q ld.so.1
648606
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
648606
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
+	exit ;;
648606
+    arc:Linux:*:* | arceb:Linux:*:*)
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     arm*:Linux:*:*)
648606
 	eval $set_cc_for_build
648606
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
648606
 	    | grep -q __ARM_EABI__
648606
 	then
648606
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	else
648606
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
648606
 		| grep -q __ARM_PCS_VFP
648606
 	    then
648606
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
648606
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
648606
 	    else
648606
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
648606
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
648606
 	    fi
648606
 	fi
648606
 	exit ;;
648606
     avr32*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     cris:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-axis-linux-gnu
648606
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
648606
 	exit ;;
648606
     crisv32:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-axis-linux-gnu
648606
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
648606
 	exit ;;
648606
     frv:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     hexagon:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     i*86:Linux:*:*)
648606
-	LIBC=gnu
648606
-	eval $set_cc_for_build
648606
-	sed 's/^	//' << EOF >$dummy.c
648606
-	#ifdef __dietlibc__
648606
-	LIBC=dietlibc
648606
-	#endif
648606
-EOF
648606
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
648606
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
648606
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
648606
 	exit ;;
648606
     ia64:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     m32r*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     m68*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     mips:Linux:*:* | mips64:Linux:*:*)
648606
 	eval $set_cc_for_build
648606
@@ -950,54 +967,63 @@
648606
 	#endif
648606
 EOF
648606
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
648606
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
648606
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
648606
 	;;
648606
+    or1k:Linux:*:*)
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
+	exit ;;
648606
     or32:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     padre:Linux:*:*)
648606
-	echo sparc-unknown-linux-gnu
648606
+	echo sparc-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     parisc64:Linux:*:* | hppa64:Linux:*:*)
648606
-	echo hppa64-unknown-linux-gnu
648606
+	echo hppa64-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     parisc:Linux:*:* | hppa:Linux:*:*)
648606
 	# Look for CPU level
648606
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
648606
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
648606
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
648606
-	  *)    echo hppa-unknown-linux-gnu ;;
648606
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
648606
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
648606
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
648606
 	esac
648606
 	exit ;;
648606
     ppc64:Linux:*:*)
648606
-	echo powerpc64-unknown-linux-gnu
648606
+	echo powerpc64-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     ppc:Linux:*:*)
648606
-	echo powerpc-unknown-linux-gnu
648606
+	echo powerpc-unknown-linux-${LIBC}
648606
+	exit ;;
648606
+    ppc64le:Linux:*:*)
648606
+	echo powerpc64le-unknown-linux-${LIBC}
648606
+	exit ;;
648606
+    ppcle:Linux:*:*)
648606
+	echo powerpcle-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     s390:Linux:*:* | s390x:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-ibm-linux
648606
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
648606
 	exit ;;
648606
     sh64*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     sh*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     sparc:Linux:*:* | sparc64:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     tile*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     vax:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-dec-linux-gnu
648606
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
648606
 	exit ;;
648606
     x86_64:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     xtensa*:Linux:*:*)
648606
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
648606
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
648606
 	exit ;;
648606
     i*86:DYNIX/ptx:4*:*)
648606
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
648606
@@ -1201,6 +1227,9 @@
648606
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
648606
 	echo i586-pc-haiku
648606
 	exit ;;
648606
+    x86_64:Haiku:*:*)
648606
+	echo x86_64-unknown-haiku
648606
+	exit ;;
648606
     SX-4:SUPER-UX:*:*)
648606
 	echo sx4-nec-superux${UNAME_RELEASE}
648606
 	exit ;;
648606
@@ -1227,19 +1256,21 @@
648606
 	exit ;;
648606
     *:Darwin:*:*)
648606
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
648606
-	case $UNAME_PROCESSOR in
648606
-	    i386)
648606
-		eval $set_cc_for_build
648606
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
648606
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
648606
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
648606
-		      grep IS_64BIT_ARCH >/dev/null
648606
-		  then
648606
-		      UNAME_PROCESSOR="x86_64"
648606
-		  fi
648606
-		fi ;;
648606
-	    unknown) UNAME_PROCESSOR=powerpc ;;
648606
-	esac
648606
+	eval $set_cc_for_build
648606
+	if test "$UNAME_PROCESSOR" = unknown ; then
648606
+	    UNAME_PROCESSOR=powerpc
648606
+	fi
648606
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
648606
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
648606
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
648606
+		grep IS_64BIT_ARCH >/dev/null
648606
+	    then
648606
+		case $UNAME_PROCESSOR in
648606
+		    i386) UNAME_PROCESSOR=x86_64 ;;
648606
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
648606
+		esac
648606
+	    fi
648606
+	fi
648606
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
648606
 	exit ;;
648606
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
648606
@@ -1256,7 +1287,7 @@
648606
     NEO-?:NONSTOP_KERNEL:*:*)
648606
 	echo neo-tandem-nsk${UNAME_RELEASE}
648606
 	exit ;;
648606
-    NSE-?:NONSTOP_KERNEL:*:*)
648606
+    NSE-*:NONSTOP_KERNEL:*:*)
648606
 	echo nse-tandem-nsk${UNAME_RELEASE}
648606
 	exit ;;
648606
     NSR-?:NONSTOP_KERNEL:*:*)
648606
@@ -1330,9 +1361,6 @@
648606
 	exit ;;
648606
 esac
648606
 
648606
-#echo '(No uname command or uname output not recognized.)' 1>&2
648606
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
648606
-
648606
 eval $set_cc_for_build
648606
 cat >$dummy.c <
648606
 #ifdef _SEQUENT_