diff options
Diffstat (limited to 'package/gnuconfig/patches/config.guess.uclibc.patch')
| -rw-r--r-- | package/gnuconfig/patches/config.guess.uclibc.patch | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/package/gnuconfig/patches/config.guess.uclibc.patch index 498b0c967..9acca1a08 100644 --- a/package/gnuconfig/patches/config.guess.uclibc.patch +++ b/package/gnuconfig/patches/config.guess.uclibc.patch @@ -1,10 +1,10 @@ Index: config.guess =================================================================== RCS file: /cvsroot/config/config/config.guess,v -retrieving revision 1.334 -diff -u -p -r1.334 config.guess ---- config.guess -+++ config.guess +retrieving revision 1.341 +diff -u -p -r1.341 config.guess +--- config.guess 22 Dec 2005 23:50:21 -0000 1.341 ++++ config.guess 30 Dec 2005 23:47:21 -0000 @@ -138,6 +138,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 @@ -29,7 +29,7 @@ diff -u -p -r1.334 config.guess # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -815,25 +832,25 @@ EOF +@@ -820,25 +837,25 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) @@ -62,19 +62,19 @@ diff -u -p -r1.334 config.guess exit ;; mips:Linux:*:*) eval $set_cc_for_build -@@ -852,7 +869,7 @@ EOF +@@ -857,7 +874,7 @@ EOF #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{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 -@@ -871,16 +888,16 @@ EOF +@@ -876,16 +893,16 @@ EOF #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; @@ -92,7 +92,7 @@ diff -u -p -r1.334 config.guess exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -893,34 +910,34 @@ EOF +@@ -898,37 +915,37 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null @@ -121,7 +121,7 @@ diff -u -p -r1.334 config.guess exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -131,13 +131,17 @@ diff -u -p -r1.334 config.guess - 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 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so -@@ -935,20 +952,21 @@ EOF +@@ -943,20 +960,22 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) @@ -159,6 +163,7 @@ diff -u -p -r1.334 config.guess + 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 |