diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-15 12:58:41 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-16 17:32:45 +0000 |
commit | fc30aeb5b70862421efb26d56f26762530261c53 (patch) | |
tree | ffddf91282be9c5ab870bbf823977db6534eabb8 /meta/recipes-devtools | |
parent | 9a566d76f5475fe731abf9bec36f0631d14a322c (diff) | |
download | poky-fc30aeb5b70862421efb26d56f26762530261c53.tar.gz |
gnu-config: update to git HEAD
Licence has update timestamp and Copyright year.
This change needs a coresponding change to ASSUME_PROVIDED
to add git-native
(From OE-Core rev: b6c2631209181f43bbe54bb41b0a668f5b9e1383)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch | 145 | ||||
-rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config_git.bb (renamed from meta/recipes-devtools/gnu-config/gnu-config_20080123.bb) | 15 |
2 files changed, 75 insertions, 85 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 index f862c83f4b..dc15d91471 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch | |||
@@ -4,12 +4,14 @@ Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-gu | |||
4 | 4 | ||
5 | updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) | 5 | updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) |
6 | updated to 20080123 by Nitin A Kamble (by hand) | 6 | updated to 20080123 by Nitin A Kamble (by hand) |
7 | updated to 20111001 by Saul Wold (by hand) | ||
8 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | 9 | ||
8 | Index: config/config.guess | 10 | Index: git/config.guess |
9 | =================================================================== | 11 | =================================================================== |
10 | --- config.orig/config.guess | 12 | --- git.orig/config.guess 2011-10-20 15:15:25.000000000 -0700 |
11 | +++ config/config.guess | 13 | +++ git/config.guess 2011-10-20 16:56:43.810830229 -0700 |
12 | @@ -139,6 +139,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | | 14 | @@ -140,6 +140,19 @@ |
13 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | 15 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
14 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 16 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
15 | 17 | ||
@@ -29,14 +31,26 @@ Index: config/config.guess | |||
29 | # Note: order is significant - the case branches are not exclusive. | 31 | # Note: order is significant - the case branches are not exclusive. |
30 | 32 | ||
31 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 33 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
32 | @@ -840,13 +853,13 @@ EOF | 34 | @@ -871,15 +884,15 @@ |
35 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
36 | esac | ||
37 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
38 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
39 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
40 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; else LIBC="" ; fi | ||
41 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
42 | exit ;; | ||
43 | arm*:Linux:*:*) | ||
44 | eval $set_cc_for_build | ||
33 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 45 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
34 | | grep -q __ARM_EABI__ | 46 | | grep -q __ARM_EABI__ |
35 | then | 47 | then |
36 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 48 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
37 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 49 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
38 | else | 50 | else |
39 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | 51 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
52 | | grep -q __ARM_PCS_VFP | ||
53 | @@ -891,19 +904,19 @@ | ||
40 | fi | 54 | fi |
41 | exit ;; | 55 | exit ;; |
42 | avr32*:Linux:*:*) | 56 | avr32*:Linux:*:*) |
@@ -44,13 +58,25 @@ Index: config/config.guess | |||
44 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 58 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
45 | exit ;; | 59 | exit ;; |
46 | cris:Linux:*:*) | 60 | cris:Linux:*:*) |
47 | echo cris-axis-linux-gnu | 61 | - echo cris-axis-linux-gnu |
48 | @@ -855,16 +868,16 @@ EOF | 62 | + echo cris-axis-linux-${LIBC} |
49 | echo crisv32-axis-linux-gnu | 63 | exit ;; |
64 | crisv32:Linux:*:*) | ||
65 | - echo crisv32-axis-linux-gnu | ||
66 | + echo crisv32-axis-linux-${LIBC} | ||
50 | exit ;; | 67 | exit ;; |
51 | frv:Linux:*:*) | 68 | frv:Linux:*:*) |
52 | - echo frv-unknown-linux-gnu | 69 | - echo frv-unknown-linux-gnu |
53 | + echo frv-unknown-linux-${LIBC} | 70 | + echo frv-unknown-linux-${LIBC} |
71 | exit ;; | ||
72 | hexagon:Linux:*:*) | ||
73 | - echo hexagon-unknown-linux-gnu | ||
74 | + echo hexagon-unknown-linux-${LIBC} | ||
75 | exit ;; | ||
76 | i*86:Linux:*:*) | ||
77 | LIBC=gnu | ||
78 | @@ -917,13 +930,13 @@ | ||
79 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
54 | exit ;; | 80 | exit ;; |
55 | ia64:Linux:*:*) | 81 | ia64:Linux:*:*) |
56 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 82 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
@@ -64,21 +90,12 @@ Index: config/config.guess | |||
64 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 90 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
65 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 91 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
66 | exit ;; | 92 | exit ;; |
67 | mips:Linux:*:*) | 93 | mips:Linux:*:* | mips64:Linux:*:*) |
68 | eval $set_cc_for_build | 94 | eval $set_cc_for_build |
69 | @@ -887,7 +900,7 @@ EOF | 95 | @@ -942,54 +955,54 @@ |
70 | s: ::g | 96 | #endif |
71 | p | 97 | EOF |
72 | }'`" | 98 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
73 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | ||
74 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | ||
75 | ;; | ||
76 | mips64:Linux:*:*) | ||
77 | eval $set_cc_for_build | ||
78 | @@ -910,16 +923,16 @@ EOF | ||
79 | s: ::g | ||
80 | p | ||
81 | }'`" | ||
82 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 99 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
83 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 100 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
84 | ;; | 101 | ;; |
@@ -86,24 +103,13 @@ Index: config/config.guess | |||
86 | - echo or32-unknown-linux-gnu | 103 | - echo or32-unknown-linux-gnu |
87 | + echo or32-unknown-linux-${LIBC} | 104 | + echo or32-unknown-linux-${LIBC} |
88 | exit ;; | 105 | exit ;; |
89 | ppc:Linux:*:*) | 106 | padre:Linux:*:*) |
90 | - echo powerpc-unknown-linux-gnu | 107 | - echo sparc-unknown-linux-gnu |
91 | + echo powerpc-unknown-linux-${LIBC} | 108 | + echo sparc-unknown-linux-${LIBC} |
92 | exit ;; | ||
93 | ppc64:Linux:*:*) | ||
94 | - echo powerpc64-unknown-linux-gnu | ||
95 | + echo powerpc64-unknown-linux-${LIBC} | ||
96 | exit ;; | 109 | exit ;; |
97 | alpha:Linux:*:*) | 110 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
98 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 111 | - echo hppa64-unknown-linux-gnu |
99 | @@ -932,40 +945,40 @@ EOF | 112 | + echo hppa64-unknown-linux-${LIBC} |
100 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
101 | esac | ||
102 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | ||
103 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
104 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
105 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi | ||
106 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
107 | exit ;; | 113 | exit ;; |
108 | parisc:Linux:*:* | hppa:Linux:*:*) | 114 | parisc:Linux:*:* | hppa:Linux:*:*) |
109 | # Look for CPU level | 115 | # Look for CPU level |
@@ -116,16 +122,20 @@ Index: config/config.guess | |||
116 | + *) echo hppa-unknown-linux-${LIBC} ;; | 122 | + *) echo hppa-unknown-linux-${LIBC} ;; |
117 | esac | 123 | esac |
118 | exit ;; | 124 | exit ;; |
119 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 125 | ppc64:Linux:*:*) |
120 | - echo hppa64-unknown-linux-gnu | 126 | - echo powerpc64-unknown-linux-gnu |
121 | + echo hppa64-unknown-linux-${LIBC} | 127 | + echo powerpc64-unknown-linux-${LIBC} |
128 | exit ;; | ||
129 | ppc:Linux:*:*) | ||
130 | - echo powerpc-unknown-linux-gnu | ||
131 | + echo powerpc-unknown-linux-${LIBC} | ||
122 | exit ;; | 132 | exit ;; |
123 | s390:Linux:*:* | s390x:Linux:*:*) | 133 | s390:Linux:*:* | s390x:Linux:*:*) |
124 | echo ${UNAME_MACHINE}-ibm-linux | 134 | echo ${UNAME_MACHINE}-ibm-linux |
125 | exit ;; | 135 | exit ;; |
126 | sh64*:Linux:*:*) | 136 | sh64*:Linux:*:*) |
127 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 137 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
128 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 138 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
129 | exit ;; | 139 | exit ;; |
130 | sh*:Linux:*:*) | 140 | sh*:Linux:*:*) |
131 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 141 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
@@ -135,42 +145,21 @@ Index: config/config.guess | |||
135 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 145 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
136 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 146 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
137 | exit ;; | 147 | exit ;; |
148 | tile*:Linux:*:*) | ||
149 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
150 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
151 | exit ;; | ||
138 | vax:Linux:*:*) | 152 | vax:Linux:*:*) |
139 | echo ${UNAME_MACHINE}-dec-linux-gnu | 153 | - echo ${UNAME_MACHINE}-dec-linux-gnu |
154 | + echo ${UNAME_MACHINE}-dec-linux-${LIBC} | ||
140 | exit ;; | 155 | exit ;; |
141 | x86_64:Linux:*:*) | 156 | x86_64:Linux:*:*) |
142 | - echo x86_64-unknown-linux-gnu | 157 | - echo x86_64-unknown-linux-gnu |
143 | + echo x86_64-unknown-linux-${LIBC} | 158 | + echo x86_64-unknown-linux-${LIBC} |
144 | exit ;; | 159 | exit ;; |
145 | xtensa*:Linux:*:*) | 160 | xtensa*:Linux:*:*) |
146 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | 161 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
147 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 162 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
148 | exit ;; | 163 | exit ;; |
149 | i*86:Linux:*:*) | 164 | i*86:DYNIX/ptx:4*:*) |
150 | # The BFD linker knows what the default object file format is, so | 165 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
151 | @@ -980,20 +993,21 @@ EOF | ||
152 | p'` | ||
153 | case "$ld_supported_targets" in | ||
154 | elf32-i386) | ||
155 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | ||
156 | + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
157 | ;; | ||
158 | a.out-i386-linux) | ||
159 | - echo "${UNAME_MACHINE}-pc-linux-gnuaout" | ||
160 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" | ||
161 | exit ;; | ||
162 | coff-i386) | ||
163 | - echo "${UNAME_MACHINE}-pc-linux-gnucoff" | ||
164 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" | ||
165 | exit ;; | ||
166 | "") | ||
167 | # Either a pre-BFD a.out linker (linux-gnuoldld) or | ||
168 | # one that does not give us useful --help. | ||
169 | - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | ||
170 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" | ||
171 | exit ;; | ||
172 | esac | ||
173 | + if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit; fi | ||
174 | # Determine whether the default compiler is a.out or elf | ||
175 | eval $set_cc_for_build | ||
176 | sed 's/^ //' << EOF >$dummy.c | ||
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index f93d342198..0fdee66ba4 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb | |||
@@ -1,21 +1,22 @@ | |||
1 | SUMMARY = "gnu-configize" | 1 | SUMMARY = "gnu-configize" |
2 | DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree" | 2 | DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree" |
3 | SECTION = "devel" | 3 | SECTION = "devel" |
4 | LICENSE = "GPLv1+" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a089987af4a25cb0419d1c2fd6d495e3" | 5 | LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=0e6ca0501b27177f3bc640f7225e3ead" |
6 | 6 | ||
7 | DEPENDS_virtclass-native = "perl-native-runtime" | 7 | DEPENDS_virtclass-native = "perl-native-runtime" |
8 | 8 | ||
9 | INHIBIT_DEFAULT_DEPS = "1" | 9 | INHIBIT_DEFAULT_DEPS = "1" |
10 | 10 | ||
11 | FIXEDSRCDATE = "${@d.getVar('FILE', 1).split('_')[-1].split('.')[0]}" | 11 | SRCREV = "a47f842264fc19837f8a00eb1d2d254a4c527334" |
12 | PV = "0.1+cvs${FIXEDSRCDATE}" | 12 | PV = "1.0+git${SRCPV}" |
13 | PR = "r4" | 13 | PR = "r0" |
14 | 14 | ||
15 | SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ | 15 | SRC_URI = "git://git.sv.gnu.org/config.git;protocol=git \ |
16 | file://config-guess-uclibc.patch \ | 16 | file://config-guess-uclibc.patch \ |
17 | file://gnu-configize.in" | 17 | file://gnu-configize.in" |
18 | S = "${WORKDIR}/config" | 18 | |
19 | S = "${WORKDIR}/git" | ||
19 | 20 | ||
20 | do_compile() { | 21 | do_compile() { |
21 | : | 22 | : |