|
@@ -0,0 +1,207 @@
|
|
|
+--- rpm-4.7.0.orig/config.guess 2008-08-30 00:27:10.000000000 +0200
|
|
|
++++ rpm-4.7.0/config.guess 2009-06-11 17:31:39.670840385 +0200
|
|
|
+@@ -4,7 +4,7 @@
|
|
|
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
|
|
+ # Free Software Foundation, Inc.
|
|
|
+
|
|
|
+-timestamp='2008-01-23'
|
|
|
++timestamp='2008-09-28'
|
|
|
+
|
|
|
+ # 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
|
|
|
+@@ -139,6 +139,23 @@ 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
|
|
|
+
|
|
|
++if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
|
|
|
++ eval $set_cc_for_build
|
|
|
++ cat << EOF > $dummy.c
|
|
|
++ #include <features.h>
|
|
|
++ #ifdef __UCLIBC__
|
|
|
++ # ifdef __UCLIBC_CONFIG_VERSION__
|
|
|
++ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
|
|
|
++ # else
|
|
|
++ LIBC=uclibc
|
|
|
++ # endif
|
|
|
++ #else
|
|
|
++ LIBC=gnu
|
|
|
++ #endif
|
|
|
++EOF
|
|
|
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
|
|
|
++fi
|
|
|
++
|
|
|
+ # Note: order is significant - the case branches are not exclusive.
|
|
|
+
|
|
|
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
|
+@@ -796,7 +813,7 @@ EOF
|
|
|
+ x86)
|
|
|
+ echo i586-pc-interix${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+- EM64T | authenticamd)
|
|
|
++ EM64T | authenticamd | genuineintel)
|
|
|
+ echo x86_64-unknown-interix${UNAME_RELEASE}
|
|
|
+ exit ;;
|
|
|
+ IA64)
|
|
|
+@@ -840,31 +857,31 @@ EOF
|
|
|
+ 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
|
|
|
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
|
|
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
|
|
|
+ fi
|
|
|
+ exit ;;
|
|
|
+ avr32*:Linux:*:*)
|
|
|
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ cris:Linux:*:*)
|
|
|
+- echo cris-axis-linux-gnu
|
|
|
++ echo cris-axis-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ crisv32:Linux:*:*)
|
|
|
+- echo crisv32-axis-linux-gnu
|
|
|
++ echo crisv32-axis-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ frv:Linux:*:*)
|
|
|
+- echo frv-unknown-linux-gnu
|
|
|
++ echo frv-unknown-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:*:*)
|
|
|
+ eval $set_cc_for_build
|
|
|
+@@ -887,7 +904,7 @@ EOF
|
|
|
+ s: ::g
|
|
|
+ p
|
|
|
+ }'`"
|
|
|
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
|
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
|
+ ;;
|
|
|
+ mips64:Linux:*:*)
|
|
|
+ eval $set_cc_for_build
|
|
|
+@@ -910,16 +927,16 @@ EOF
|
|
|
+ s: ::g
|
|
|
+ p
|
|
|
+ }'`"
|
|
|
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
|
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
|
+ ;;
|
|
|
+ or32:Linux:*:*)
|
|
|
+- echo or32-unknown-linux-gnu
|
|
|
++ echo or32-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ ppc:Linux:*:*)
|
|
|
+- echo powerpc-unknown-linux-gnu
|
|
|
++ echo powerpc-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ ppc64:Linux:*:*)
|
|
|
+- echo powerpc64-unknown-linux-gnu
|
|
|
++ echo powerpc64-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ alpha:Linux:*:*)
|
|
|
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
|
+@@ -932,40 +949,43 @@ EOF
|
|
|
+ EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
|
+ esac
|
|
|
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
|
+- 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 ;;
|
|
|
++ padre:Linux:*:*)
|
|
|
++ echo sparc-unknown-linux-gnu
|
|
|
+ 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 ;;
|
|
|
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
|
+- echo hppa64-unknown-linux-gnu
|
|
|
++ echo hppa64-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ s390:Linux:*:* | s390x:Linux:*:*)
|
|
|
+ echo ${UNAME_MACHINE}-ibm-linux
|
|
|
+ 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 ;;
|
|
|
+ vax:Linux:*:*)
|
|
|
+- echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
|
++ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ x86_64:Linux:*:*)
|
|
|
+- echo x86_64-unknown-linux-gnu
|
|
|
++ echo x86_64-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ xtensa*:Linux:*:*)
|
|
|
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
+ exit ;;
|
|
|
+ i*86:Linux:*:*)
|
|
|
+ # The BFD linker knows what the default object file format is, so
|
|
|
+@@ -980,20 +1000,19 @@ EOF
|
|
|
+ p'`
|
|
|
+ case "$ld_supported_targets" in
|
|
|
+ elf32-i386)
|
|
|
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
|
++ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
|
+ ;;
|
|
|
+ a.out-i386-linux)
|
|
|
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
|
|
+- exit ;;
|
|
|
+- coff-i386)
|
|
|
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
|
|
|
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
|
|
|
+ exit ;;
|
|
|
+ "")
|
|
|
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
|
+ # one that does not give us useful --help.
|
|
|
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
|
|
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
|
|
|
+ exit ;;
|
|
|
+ esac
|
|
|
++ # This should get integrated into the C code below, but now we hack
|
|
|
++ if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
|
|
|
+ # Determine whether the default compiler is a.out or elf
|
|
|
+ eval $set_cc_for_build
|
|
|
+ sed 's/^ //' << EOF >$dummy.c
|
|
|
+@@ -1216,6 +1235,9 @@ EOF
|
|
|
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
|
|
+ echo i586-pc-beos
|
|
|
+ exit ;;
|
|
|
++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
|
|
++ echo i586-pc-haiku
|
|
|
++ exit ;;
|
|
|
+ SX-4:SUPER-UX:*:*)
|
|
|
+ echo sx4-nec-superux${UNAME_RELEASE}
|
|
|
+ exit ;;
|