diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch b/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch new file mode 100644 index 0000000000..267791393e --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0012-Make-ld-version-output-matching-grok-gold-s-output.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 49471ab1f90e392da9520eea831ce8731be9fc8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 18 Mar 2015 00:25:45 +0000 | ||
4 | Subject: [PATCH 12/27] Make ld --version output matching grok gold's output | ||
5 | |||
6 | adapted from from upstream branch roland/gold-vs-libc | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | configure | 2 +- | ||
13 | configure.ac | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 45cc7cb..7d7299a 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -4709,7 +4709,7 @@ else | ||
21 | # Found it, now check the version. | ||
22 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 | ||
23 | $as_echo_n "checking version of $LD... " >&6; } | ||
24 | - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` | ||
25 | + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` | ||
26 | case $ac_prog_version in | ||
27 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | ||
28 | 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) | ||
29 | diff --git a/configure.ac b/configure.ac | ||
30 | index 7e9383a..a467a69 100644 | ||
31 | --- a/configure.ac | ||
32 | +++ b/configure.ac | ||
33 | @@ -941,7 +941,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, | ||
34 | [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], | ||
35 | AS=: critic_missing="$critic_missing as") | ||
36 | AC_CHECK_PROG_VER(LD, $LD, --version, | ||
37 | - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], | ||
38 | + [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], | ||
39 | [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], | ||
40 | LD=: critic_missing="$critic_missing ld") | ||
41 | |||
42 | -- | ||
43 | 2.1.4 | ||
44 | |||