binutils 2.16 csl-2005e3: added makeinfo patch

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3692 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 37 insertions, 2 deletions

diff --git a/meta/packages/binutils/binutils-2.16+csl-arm-2005q3-2/binutils-configure-texinfo-version.patch b/meta/packages/binutils/binutils-2.16+csl-arm-2005q3-2/binutils-configure-texinfo-version.patch
new file mode 100644
index 0000000000..bae3d637ea
--- /dev/null
+++ b/meta/packages/binutils/binutils-2.16+csl-arm-2005q3-2/binutils-configure-texinfo-version.patch
@@ -0,0 +1,35 @@
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- binutils-2.17pre.orig/configure
++++ binutils-2.17pre/configure
+@@ -3541,11 +3541,11 @@ case " $build_configdirs " in
+   *)
+ 
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+     fi
+     ;;
+--- binutils-2.17pre.orig/configure.in
++++ binutils-2.17pre/configure.in
+@@ -2126,11 +2126,11 @@ case " $build_configdirs " in
+   *)
+ changequote(,)
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+     fi
+     ;;
diff --git a/meta/packages/binutils/binutils-cross_csl-arm-2005q3-2.bb b/meta/packages/binutils/binutils-cross_csl-arm-2005q3-2.bb
index 2174074ab6..8753c3eb22 100644
--- a/meta/packages/binutils/binutils-cross_csl-arm-2005q3-2.bb
+++ b/meta/packages/binutils/binutils-cross_csl-arm-2005q3-2.bb
@@ -1,4 +1,3 @@
 require binutils_csl-arm-2005q3-2.bb
 require binutils-cross.inc
-FILESDIR = "${FILE_DIRNAME}/binutils-{PV}"
 S = "${WORKDIR}/binutils-2.17pre"
diff --git a/meta/packages/binutils/binutils_csl-arm-2005q3-2.bb b/meta/packages/binutils/binutils_csl-arm-2005q3-2.bb
index 4a5855bc77..96026d449e 100644
--- a/meta/packages/binutils/binutils_csl-arm-2005q3-2.bb
+++ b/meta/packages/binutils/binutils_csl-arm-2005q3-2.bb
@@ -43,7 +43,8 @@ FILES_${PN}-symlinks = " \
         ${bindir}/strings \
         ${bindir}/strip"
 
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2"
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
+           file://binutils-configure-texinfo-version.patch;patch=1"
 
 do_unpack2() {
         cd ${WORKDIR}