diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-05-28 23:55:46 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-30 16:31:22 +0100 |
| commit | 2a36a02c2444551579b8498468debfaff0faa6d8 (patch) | |
| tree | 6338bbd1a95fa516de22dd3ea7b327b06c0767ef /meta/recipes-core/eglibc | |
| parent | 68a0e34260f884f6fb39aae2d0bad035b2b1d177 (diff) | |
| download | openembedded-core-2a36a02c2444551579b8498468debfaff0faa6d8.tar.gz openembedded-core-2a36a02c2444551579b8498468debfaff0faa6d8.tar.bz2 openembedded-core-2a36a02c2444551579b8498468debfaff0faa6d8.zip | |
eglibc: Fix configure when re-building with gold
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
| -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 | 1 |
2 files changed, 35 insertions, 0 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 @@ +Make ld --version output matching grok gold's output + +adapted from from upstream branch roland/gold-vs-libc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport + + +Index: libc/configure +=================================================================== +--- libc.orig/configure ++++ libc/configure +@@ -4654,7 +4654,7 @@ else + # Found it, now check the version. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 + $as_echo_n "checking version of $LD... " >&6; } +- ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` ++ ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) +Index: libc/configure.ac +=================================================================== +--- libc.orig/configure.ac ++++ libc/configure.ac +@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], + [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") + AC_CHECK_PROG_VER(LD, $LD, --version, +- [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], ++ [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], + [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") + + # 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 1ddce8224a..10b4bb1a7f 100644 --- a/meta/recipes-core/eglibc/eglibc_2.19.bb +++ b/meta/recipes-core/eglibc/eglibc_2.19.bb @@ -25,6 +25,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://fix-tibetian-locales.patch \ file://ppce6500-32b_slow_ieee754_sqrt.patch \ + file://grok_gold.patch \ " SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" |