summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-23 19:18:06 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-23 19:18:06 +0000
commitd9d45406096e1e9a0d1cef853b0f5030c0495e1c (patch)
tree82cb589e669ab7b0d6e5423c4f5d8e5746eeafb0 /meta
parent2bbf5cedf24958ecba266fbcf8bf11b0d917fee5 (diff)
downloadpoky-d9d45406096e1e9a0d1cef853b0f5030c0495e1c.tar.gz
glibc: Allow 2.9 to work with binutils 2.20 (patch from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/glibc/glibc-2.9/glibc-2.9-enable-binutils-2.2.patch35
-rw-r--r--meta/packages/glibc/glibc_2.9.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/packages/glibc/glibc-2.9/glibc-2.9-enable-binutils-2.2.patch b/meta/packages/glibc/glibc-2.9/glibc-2.9-enable-binutils-2.2.patch
new file mode 100644
index 0000000000..09200dd43b
--- /dev/null
+++ b/meta/packages/glibc/glibc-2.9/glibc-2.9-enable-binutils-2.2.patch
@@ -0,0 +1,35 @@
1--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200
2+++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200
3@@ -844,10 +844,10 @@
4 # Accept binutils 2.13 or newer.
5 AC_CHECK_PROG_VER(AS, $AS, --version,
6 [GNU assembler.* \([0-9]*\.[0-9.]*\)],
7- [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
8+ [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as")
9 AC_CHECK_PROG_VER(LD, $LD, --version,
10 [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
11- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
12+ [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld")
13
14 # We need the physical current working directory. We cannot use the
15 # "pwd -P" shell builtin since that's not portable. Instead we try to
16--- glibc-2.9.orig/configure 2009-02-26 22:28:17.000000000 +0100
17+++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200
18@@ -4531,7 +4531,7 @@
19 ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
20 case $ac_prog_version in
21 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
22- 2.1[3-9]*)
23+ 2.1[3-9]* | 2.2*)
24 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
25 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
26
27@@ -4594,7 +4594,7 @@
28 ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
29 case $ac_prog_version in
30 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
31- 2.1[3-9]*)
32+ 2.1[3-9]* | 2.2*)
33 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
34 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
35
diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb
index 7e3c70e204..eec2ed29e2 100644
--- a/meta/packages/glibc/glibc_2.9.bb
+++ b/meta/packages/glibc/glibc_2.9.bb
@@ -64,6 +64,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
64 file://tls_i486.patch;patch=1 \ 64 file://tls_i486.patch;patch=1 \
65 file://rulesfix.patch;patch=1 \ 65 file://rulesfix.patch;patch=1 \
66 file://glibc-2.9-use-_begin.patch;patch=1 \ 66 file://glibc-2.9-use-_begin.patch;patch=1 \
67 file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \
67 " 68 "
68 69
69# Build fails on sh3 and sh4 without additional patches 70# Build fails on sh3 and sh4 without additional patches