binutils 2.16.91.0.7: added makeinfo patch

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

2 files changed, 39 insertions, 3 deletions

diff --git a/meta/packages/binutils/binutils-2.16.91.0.7/binutils-configure-texinfo-version.patch b/meta/packages/binutils/binutils-2.16.91.0.7/binutils-configure-texinfo-version.patch
new file mode 100644
index 0000000000..9e57e3db01
--- /dev/null
+++ b/meta/packages/binutils/binutils-2.16.91.0.7/binutils-configure-texinfo-version.patch
@@ -0,0 +1,35 @@
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- binutils-2.16.91.0.7.orig/configure
++++ binutils-2.16.91.0.7/configure
+@@ -3629,11 +3629,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.16.91.0.7.orig/configure.in
++++ binutils-2.16.91.0.7/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_2.16.91.0.7.bb b/meta/packages/binutils/binutils_2.16.91.0.7.bb
index 8a6c3f5e16..05f149d616 100644
--- a/meta/packages/binutils/binutils_2.16.91.0.7.bb
+++ b/meta/packages/binutils/binutils_2.16.91.0.7.bb
@@ -36,15 +36,16 @@ FILES_${PN}-symlinks = " \
         ${bindir}/strings \
         ${bindir}/strip"
 
-SRC_URI = \
-    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+SRC_URI = "\
+     http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
      file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
      file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
      file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
      file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
-     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1"
+     file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1 \
+     file://binutils-configure-texinfo-version.patch;patch=1"
 
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"