diff options
Diffstat (limited to 'meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch')
-rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch | 174 |
1 files changed, 174 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch new file mode 100644 index 0000000000..f820cef1c9 --- /dev/null +++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch | |||
@@ -0,0 +1,174 @@ | |||
1 | Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch. | ||
2 | |||
3 | updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) | ||
4 | updated to 20080123 by Nitin A Kamble (by hand) | ||
5 | |||
6 | Index: config/config.guess | ||
7 | =================================================================== | ||
8 | --- config.orig/config.guess | ||
9 | +++ config/config.guess | ||
10 | @@ -139,6 +139,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | | ||
11 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | ||
12 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | ||
13 | |||
14 | +# Detect uclibc systems. | ||
15 | + | ||
16 | +LIBC="gnu" | ||
17 | +if [ -f /usr/include/bits/uClibc_config.h ] | ||
18 | +then | ||
19 | + LIBC=uclibc | ||
20 | + if [ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ] | ||
21 | + then | ||
22 | + UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h` | ||
23 | + LIBC=$LIBC$UCLIBC_SUBVER | ||
24 | + fi | ||
25 | +fi | ||
26 | + | ||
27 | # Note: order is significant - the case branches are not exclusive. | ||
28 | |||
29 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | ||
30 | @@ -840,13 +853,13 @@ EOF | ||
31 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
32 | | grep -q __ARM_EABI__ | ||
33 | then | ||
34 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
35 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
36 | else | ||
37 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | ||
38 | fi | ||
39 | exit ;; | ||
40 | avr32*:Linux:*:*) | ||
41 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
42 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
43 | exit ;; | ||
44 | cris:Linux:*:*) | ||
45 | echo cris-axis-linux-gnu | ||
46 | @@ -855,16 +868,16 @@ EOF | ||
47 | echo crisv32-axis-linux-gnu | ||
48 | exit ;; | ||
49 | frv:Linux:*:*) | ||
50 | - echo frv-unknown-linux-gnu | ||
51 | + echo frv-unknown-linux-${LIBC} | ||
52 | exit ;; | ||
53 | ia64:Linux:*:*) | ||
54 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
55 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
56 | exit ;; | ||
57 | m32r*:Linux:*:*) | ||
58 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
59 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
60 | exit ;; | ||
61 | m68*:Linux:*:*) | ||
62 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
63 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
64 | exit ;; | ||
65 | mips:Linux:*:*) | ||
66 | eval $set_cc_for_build | ||
67 | @@ -887,7 +900,7 @@ EOF | ||
68 | s: ::g | ||
69 | p | ||
70 | }'`" | ||
71 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | ||
72 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | ||
73 | ;; | ||
74 | mips64:Linux:*:*) | ||
75 | eval $set_cc_for_build | ||
76 | @@ -910,16 +923,16 @@ EOF | ||
77 | s: ::g | ||
78 | p | ||
79 | }'`" | ||
80 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | ||
81 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | ||
82 | ;; | ||
83 | or32:Linux:*:*) | ||
84 | - echo or32-unknown-linux-gnu | ||
85 | + echo or32-unknown-linux-${LIBC} | ||
86 | exit ;; | ||
87 | ppc:Linux:*:*) | ||
88 | - echo powerpc-unknown-linux-gnu | ||
89 | + echo powerpc-unknown-linux-${LIBC} | ||
90 | exit ;; | ||
91 | ppc64:Linux:*:*) | ||
92 | - echo powerpc64-unknown-linux-gnu | ||
93 | + echo powerpc64-unknown-linux-${LIBC} | ||
94 | exit ;; | ||
95 | alpha:Linux:*:*) | ||
96 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
97 | @@ -932,40 +945,40 @@ EOF | ||
98 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
99 | esac | ||
100 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | ||
101 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
102 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
103 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi | ||
104 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
105 | exit ;; | ||
106 | parisc:Linux:*:* | hppa:Linux:*:*) | ||
107 | # Look for CPU level | ||
108 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | ||
109 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; | ||
110 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; | ||
111 | - *) echo hppa-unknown-linux-gnu ;; | ||
112 | + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; | ||
113 | + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; | ||
114 | + *) echo hppa-unknown-linux-${LIBC} ;; | ||
115 | esac | ||
116 | exit ;; | ||
117 | parisc64:Linux:*:* | hppa64:Linux:*:*) | ||
118 | - echo hppa64-unknown-linux-gnu | ||
119 | + echo hppa64-unknown-linux-${LIBC} | ||
120 | exit ;; | ||
121 | s390:Linux:*:* | s390x:Linux:*:*) | ||
122 | echo ${UNAME_MACHINE}-ibm-linux | ||
123 | exit ;; | ||
124 | sh64*:Linux:*:*) | ||
125 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
126 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
127 | exit ;; | ||
128 | sh*:Linux:*:*) | ||
129 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
130 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
131 | exit ;; | ||
132 | sparc:Linux:*:* | sparc64:Linux:*:*) | ||
133 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
134 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
135 | exit ;; | ||
136 | vax:Linux:*:*) | ||
137 | echo ${UNAME_MACHINE}-dec-linux-gnu | ||
138 | exit ;; | ||
139 | x86_64:Linux:*:*) | ||
140 | - echo x86_64-unknown-linux-gnu | ||
141 | + echo x86_64-unknown-linux-${LIBC} | ||
142 | exit ;; | ||
143 | xtensa*:Linux:*:*) | ||
144 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
145 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
146 | exit ;; | ||
147 | i*86:Linux:*:*) | ||
148 | # The BFD linker knows what the default object file format is, so | ||
149 | @@ -980,20 +993,21 @@ EOF | ||
150 | p'` | ||
151 | case "$ld_supported_targets" in | ||
152 | elf32-i386) | ||
153 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | ||
154 | + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
155 | ;; | ||
156 | a.out-i386-linux) | ||
157 | - echo "${UNAME_MACHINE}-pc-linux-gnuaout" | ||
158 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" | ||
159 | exit ;; | ||
160 | coff-i386) | ||
161 | - echo "${UNAME_MACHINE}-pc-linux-gnucoff" | ||
162 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" | ||
163 | exit ;; | ||
164 | "") | ||
165 | # Either a pre-BFD a.out linker (linux-gnuoldld) or | ||
166 | # one that does not give us useful --help. | ||
167 | - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | ||
168 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" | ||
169 | exit ;; | ||
170 | esac | ||
171 | + if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit; fi | ||
172 | # Determine whether the default compiler is a.out or elf | ||
173 | eval $set_cc_for_build | ||
174 | sed 's/^ //' << EOF >$dummy.c | ||