diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-06-21 00:17:17 -0700 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-06-30 23:30:26 -0700 |
commit | 5cfe04d572299c9d2c7d90218a242b884d5e3b43 (patch) | |
tree | cf2ebb4c912c61ee33a29cc06dc3e50345f64623 /meta | |
parent | d74cf86d1e540d7476a5f1ed111ba49cc0988ad7 (diff) | |
download | poky-5cfe04d572299c9d2c7d90218a242b884d5e3b43.tar.gz |
gnu-config: upgrade from 20050701 to 20080123
Rebased this patch for newer version:
gnu-config/config-guess-uclibc.patch
Removed this patch as it's included in the new source:
gnu-config/avr32.patch
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/gnu-config/gnu-config/avr32.patch | 20 | ||||
-rw-r--r-- | meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch | 55 | ||||
-rw-r--r-- | meta/packages/gnu-config/gnu-config_20080123.bb (renamed from meta/packages/gnu-config/gnu-config_20050701.bb) | 5 |
3 files changed, 39 insertions, 41 deletions
diff --git a/meta/packages/gnu-config/gnu-config/avr32.patch b/meta/packages/gnu-config/gnu-config/avr32.patch deleted file mode 100644 index 43efcd8a2e..0000000000 --- a/meta/packages/gnu-config/gnu-config/avr32.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | --- /tmp/config.sub 2007-06-01 15:29:41.000000000 +0200 | ||
2 | +++ config/config.sub 2007-06-01 15:58:50.005251000 +0200 | ||
3 | @@ -231,7 +231,7 @@ | ||
4 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
5 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
6 | | am33_2.0 \ | ||
7 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | ||
8 | + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | ||
9 | | bfin \ | ||
10 | | c4x | clipper \ | ||
11 | | d10v | d30v | dlx | dsp16xx \ | ||
12 | @@ -305,7 +305,7 @@ | ||
13 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
14 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | ||
15 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | ||
16 | - | avr-* \ | ||
17 | + | avr-* | avr32-* \ | ||
18 | | bfin-* | bs2000-* \ | ||
19 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | ||
20 | | clipper-* | craynv-* | cydra-* \ | ||
diff --git a/meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch b/meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch index b322157e9b..f820cef1c9 100644 --- a/meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch +++ b/meta/packages/gnu-config/gnu-config/config-guess-uclibc.patch | |||
@@ -1,12 +1,13 @@ | |||
1 | Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch. | 1 | Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch. |
2 | 2 | ||
3 | updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) | 3 | updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) |
4 | updated to 20080123 by Nitin A Kamble (by hand) | ||
4 | 5 | ||
5 | Index: config/config.guess | 6 | Index: config/config.guess |
6 | =================================================================== | 7 | =================================================================== |
7 | --- config.guess.original 2005-05-16 13:43:19 +0200 | 8 | --- config.orig/config.guess |
8 | +++ config.guess 2005-05-16 13:45:26 +0200 | 9 | +++ config/config.guess |
9 | @@ -138,6 +138,19 @@ | 10 | @@ -139,6 +139,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | |
10 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | 11 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
11 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 12 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
12 | 13 | ||
@@ -26,16 +27,23 @@ Index: config/config.guess | |||
26 | # Note: order is significant - the case branches are not exclusive. | 27 | # Note: order is significant - the case branches are not exclusive. |
27 | 28 | ||
28 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 29 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
29 | @@ -847,7 +860,7 @@ | 30 | @@ -840,13 +853,13 @@ EOF |
30 | echo ${UNAME_MACHINE}-pc-minix | 31 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
31 | exit ;; | 32 | | grep -q __ARM_EABI__ |
32 | arm*:Linux:*:*) | 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:*:*) | ||
33 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 41 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
34 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 42 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
35 | exit ;; | 43 | exit ;; |
36 | cris:Linux:*:*) | 44 | cris:Linux:*:*) |
37 | echo cris-axis-linux-gnu | 45 | echo cris-axis-linux-gnu |
38 | @@ -856,16 +869,16 @@ | 46 | @@ -855,16 +868,16 @@ EOF |
39 | echo crisv32-axis-linux-gnu | 47 | echo crisv32-axis-linux-gnu |
40 | exit ;; | 48 | exit ;; |
41 | frv:Linux:*:*) | 49 | frv:Linux:*:*) |
@@ -56,22 +64,26 @@ Index: config/config.guess | |||
56 | exit ;; | 64 | exit ;; |
57 | mips:Linux:*:*) | 65 | mips:Linux:*:*) |
58 | eval $set_cc_for_build | 66 | eval $set_cc_for_build |
59 | @@ -884,7 +897,7 @@ | 67 | @@ -887,7 +900,7 @@ EOF |
60 | #endif | 68 | s: ::g |
61 | EOF | 69 | p |
62 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | 70 | }'`" |
63 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 71 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
64 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 72 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
65 | ;; | 73 | ;; |
66 | mips64:Linux:*:*) | 74 | mips64:Linux:*:*) |
67 | eval $set_cc_for_build | 75 | eval $set_cc_for_build |
68 | @@ -903,13 +916,13 @@ | 76 | @@ -910,16 +923,16 @@ EOF |
69 | #endif | 77 | s: ::g |
70 | EOF | 78 | p |
71 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | 79 | }'`" |
72 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 80 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
73 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 81 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
74 | ;; | 82 | ;; |
83 | or32:Linux:*:*) | ||
84 | - echo or32-unknown-linux-gnu | ||
85 | + echo or32-unknown-linux-${LIBC} | ||
86 | exit ;; | ||
75 | ppc:Linux:*:*) | 87 | ppc:Linux:*:*) |
76 | - echo powerpc-unknown-linux-gnu | 88 | - echo powerpc-unknown-linux-gnu |
77 | + echo powerpc-unknown-linux-${LIBC} | 89 | + echo powerpc-unknown-linux-${LIBC} |
@@ -82,7 +94,7 @@ Index: config/config.guess | |||
82 | exit ;; | 94 | exit ;; |
83 | alpha:Linux:*:*) | 95 | alpha:Linux:*:*) |
84 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 96 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
85 | @@ -922,34 +935,34 @@ | 97 | @@ -932,40 +945,40 @@ EOF |
86 | EV68*) UNAME_MACHINE=alphaev68 ;; | 98 | EV68*) UNAME_MACHINE=alphaev68 ;; |
87 | esac | 99 | esac |
88 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | 100 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
@@ -121,13 +133,20 @@ Index: config/config.guess | |||
121 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 133 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
122 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 134 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
123 | exit ;; | 135 | exit ;; |
136 | vax:Linux:*:*) | ||
137 | echo ${UNAME_MACHINE}-dec-linux-gnu | ||
138 | exit ;; | ||
124 | x86_64:Linux:*:*) | 139 | x86_64:Linux:*:*) |
125 | - echo x86_64-unknown-linux-gnu | 140 | - echo x86_64-unknown-linux-gnu |
126 | + echo x86_64-unknown-linux-${LIBC} | 141 | + echo x86_64-unknown-linux-${LIBC} |
127 | exit ;; | 142 | exit ;; |
143 | xtensa*:Linux:*:*) | ||
144 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
145 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
146 | exit ;; | ||
128 | i*86:Linux:*:*) | 147 | i*86:Linux:*:*) |
129 | # The BFD linker knows what the default object file format is, so | 148 | # The BFD linker knows what the default object file format is, so |
130 | @@ -964,20 +977,21 @@ | 149 | @@ -980,20 +993,21 @@ EOF |
131 | p'` | 150 | p'` |
132 | case "$ld_supported_targets" in | 151 | case "$ld_supported_targets" in |
133 | elf32-i386) | 152 | elf32-i386) |
diff --git a/meta/packages/gnu-config/gnu-config_20050701.bb b/meta/packages/gnu-config/gnu-config_20080123.bb index b8c8766ba2..5dc76524d3 100644 --- a/meta/packages/gnu-config/gnu-config_20050701.bb +++ b/meta/packages/gnu-config/gnu-config_20080123.bb | |||
@@ -6,11 +6,10 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
6 | 6 | ||
7 | FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" | 7 | FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" |
8 | PV = "0.1+cvs${FIXEDSRCDATE}" | 8 | PV = "0.1+cvs${FIXEDSRCDATE}" |
9 | PR = "r6" | 9 | PR = "r0" |
10 | 10 | ||
11 | SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ | 11 | SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ |
12 | file://config-guess-uclibc.patch;patch=1 \ | 12 | file://config-guess-uclibc.patch \ |
13 | file://avr32.patch;patch=1 \ | ||
14 | file://gnu-configize.in" | 13 | file://gnu-configize.in" |
15 | S = "${WORKDIR}/config" | 14 | S = "${WORKDIR}/config" |
16 | 15 | ||