binutils 2.17+csl 2006q1: add makeinfo patch

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

2 files changed, 39 insertions, 3 deletions

diff --git a/meta/packages/binutils/binutils-2.17+csl-arm-2006q1-6/binutils-configure-texinfo-version.patch b/meta/packages/binutils/binutils-2.17+csl-arm-2006q1-6/binutils-configure-texinfo-version.patch
new file mode 100644
index 0000000000..aad8528f1d
--- /dev/null
+++ b/meta/packages/binutils/binutils-2.17+csl-arm-2006q1-6/binutils-configure-texinfo-version.patch
@@ -0,0 +1,35 @@
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- binutils-2.17.orig/configure
++++ binutils-2.17/configure
+@@ -3635,11 +3635,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.17.orig/configure.in
++++ binutils-2.17/configure.in
+@@ -2204,11 +2204,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_csl-arm-2006q1.bb b/meta/packages/binutils/binutils_csl-arm-2006q1.bb
index 76c8fe53dc..b7f8841174 100644
--- a/meta/packages/binutils/binutils_csl-arm-2006q1.bb
+++ b/meta/packages/binutils/binutils_csl-arm-2006q1.bb
@@ -43,8 +43,8 @@ FILES_${PN}-symlinks = " \
 	${bindir}/strings \
 	${bindir}/strip"
 
-SRC_URI = \
-    "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
+SRC_URI = "\
+     http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
      file://binutils-2.17-csl-tc-arm-mmxwc-polymorphism.patch;patch=1;pnum=1\
      file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1;pnum=1\
      file://binutils-uclibc-100-uclibc-conf.patch;patch=1;pnum=1 \
@@ -52,7 +52,8 @@ SRC_URI = \
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1;pnum=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1;pnum=1 \
      file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1;pnum=1 \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1;pnum=1"
+     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1;pnum=1 \
+     file://binutils-configure-texinfo-version.patch;patch=1"
 
 do_unpack2() {
 	cd ${WORKDIR}