diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/grok_gold.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/grok_gold.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-core/glibc/glibc/grok_gold.patch b/meta/recipes-core/glibc/glibc/grok_gold.patch index 26875c79d4..5151802ecf 100644 --- a/meta/recipes-core/glibc/glibc/grok_gold.patch +++ b/meta/recipes-core/glibc/glibc/grok_gold.patch | |||
@@ -8,9 +8,9 @@ Upstream-Status: Backport | |||
8 | 8 | ||
9 | Index: git/configure | 9 | Index: git/configure |
10 | =================================================================== | 10 | =================================================================== |
11 | --- git.orig/configure 2014-08-29 10:32:34.464070587 -0700 | 11 | --- git.orig/configure |
12 | +++ git/configure 2014-08-29 10:32:34.456070587 -0700 | 12 | +++ git/configure |
13 | @@ -4592,7 +4592,7 @@ | 13 | @@ -4593,7 +4593,7 @@ else |
14 | # Found it, now check the version. | 14 | # Found it, now check the version. |
15 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 | 15 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 |
16 | $as_echo_n "checking version of $LD... " >&6; } | 16 | $as_echo_n "checking version of $LD... " >&6; } |
@@ -18,17 +18,17 @@ Index: git/configure | |||
18 | + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([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 | 19 | case $ac_prog_version in |
20 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | 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]*) | 21 | 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) |
22 | Index: git/configure.ac | 22 | Index: git/configure.ac |
23 | =================================================================== | 23 | =================================================================== |
24 | --- git.orig/configure.ac 2014-08-29 10:32:34.464070587 -0700 | 24 | --- git.orig/configure.ac |
25 | +++ git/configure.ac 2014-08-29 10:32:34.460070587 -0700 | 25 | +++ git/configure.ac |
26 | @@ -930,7 +930,7 @@ | 26 | @@ -913,7 +913,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, |
27 | [GNU assembler.* \([0-9]*\.[0-9.]*\)], | 27 | [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-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") | 28 | AS=: critic_missing="$critic_missing as") |
29 | AC_CHECK_PROG_VER(LD, $LD, --version, | 29 | AC_CHECK_PROG_VER(LD, $LD, --version, |
30 | - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], | 30 | - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], |
31 | + [GNU [Bbinutilsd][^.]* \([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") | 32 | [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], |
33 | LD=: critic_missing="$critic_missing ld") | ||
33 | 34 | ||
34 | # These programs are version sensitive. | ||