diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-23 19:18:06 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-23 19:18:06 +0000 |
| commit | d9d45406096e1e9a0d1cef853b0f5030c0495e1c (patch) | |
| tree | 82cb589e669ab7b0d6e5423c4f5d8e5746eeafb0 | |
| parent | 2bbf5cedf24958ecba266fbcf8bf11b0d917fee5 (diff) | |
| download | openembedded-core-d9d45406096e1e9a0d1cef853b0f5030c0495e1c.tar.gz openembedded-core-d9d45406096e1e9a0d1cef853b0f5030c0495e1c.tar.bz2 openembedded-core-d9d45406096e1e9a0d1cef853b0f5030c0495e1c.zip | |
glibc: Allow 2.9 to work with binutils 2.20 (patch from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/glibc/glibc-2.9/glibc-2.9-enable-binutils-2.2.patch | 35 | ||||
| -rw-r--r-- | meta/packages/glibc/glibc_2.9.bb | 1 |
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 @@ +--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200 ++++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200 +@@ -844,10 +844,10 @@ + # Accept binutils 2.13 or newer. + AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") ++ [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as") + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") ++ [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld") + + # We need the physical current working directory. We cannot use the + # "pwd -P" shell builtin since that's not portable. Instead we try to +--- glibc-2.9.orig/configure 2009-02-26 22:28:17.000000000 +0100 ++++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200 +@@ -4531,7 +4531,7 @@ + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -4594,7 +4594,7 @@ + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + 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 \ file://tls_i486.patch;patch=1 \ file://rulesfix.patch;patch=1 \ file://glibc-2.9-use-_begin.patch;patch=1 \ + file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \ " # Build fails on sh3 and sh4 without additional patches |