diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-05-28 23:55:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:18 +0100 |
commit | bff6db67126cd534cb7c2236195d368fb817c0d9 (patch) | |
tree | 5ba618319f8df6fd468a7a08af77f7a8593e0ade /meta/recipes-core | |
parent | 62b1fef7875a6f9c55344fa6bcc7d4b6672eac1f (diff) | |
download | poky-bff6db67126cd534cb7c2236195d368fb817c0d9.tar.gz |
eglibc: Fix configure when re-building with gold
(From OE-Core rev: 2a36a02c2444551579b8498468debfaff0faa6d8)
(From OE-Core rev: 1e2aa57d621fa816fa7fc652a3b7d2920844c74d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/recipes-core/eglibc/eglibc_2.19.bb
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.19/grok_gold.patch | 34 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.19.bb | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/grok_gold.patch b/meta/recipes-core/eglibc/eglibc-2.19/grok_gold.patch new file mode 100644 index 0000000000..d46737af98 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.19/grok_gold.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Make ld --version output matching grok gold's output | ||
2 | |||
3 | adapted from from upstream branch roland/gold-vs-libc | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Backport | ||
7 | |||
8 | |||
9 | Index: libc/configure | ||
10 | =================================================================== | ||
11 | --- libc.orig/configure | ||
12 | +++ libc/configure | ||
13 | @@ -4654,7 +4654,7 @@ else | ||
14 | # Found it, now check the version. | ||
15 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 | ||
16 | $as_echo_n "checking version of $LD... " >&6; } | ||
17 | - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` | ||
18 | + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` | ||
19 | case $ac_prog_version in | ||
20 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | ||
21 | 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) | ||
22 | Index: libc/configure.ac | ||
23 | =================================================================== | ||
24 | --- libc.orig/configure.ac | ||
25 | +++ libc/configure.ac | ||
26 | @@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, | ||
27 | [GNU assembler.* \([0-9]*\.[0-9.]*\)], | ||
28 | [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") | ||
29 | AC_CHECK_PROG_VER(LD, $LD, --version, | ||
30 | - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], | ||
31 | + [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], | ||
32 | [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") | ||
33 | |||
34 | # These programs are version sensitive. | ||
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb index 8f096769ee..c65e6a592b 100644 --- a/meta/recipes-core/eglibc/eglibc_2.19.bb +++ b/meta/recipes-core/eglibc/eglibc_2.19.bb | |||
@@ -24,7 +24,8 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25 | |||
24 | file://0001-R_ARM_TLS_DTPOFF32.patch \ | 24 | file://0001-R_ARM_TLS_DTPOFF32.patch \ |
25 | file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ | 25 | file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ |
26 | file://fix-tibetian-locales.patch \ | 26 | file://fix-tibetian-locales.patch \ |
27 | file://ppce6500-32b_slow_ieee754_sqrt.patch \ | 27 | file://ppce6500-32b_slow_ieee754_sqrt.patch \ |
28 | file://grok_gold.patch \ | ||
28 | " | 29 | " |
29 | SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" | 30 | SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" |
30 | SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" | 31 | SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" |