From 7fcc99585962e5e8dcf34ce0e62ef447218b26b0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 7 Feb 2008 13:15:37 +0000
Subject: gcc-csl 2006q1: added makeinfo patch

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3698 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../gcc/gcc-csl-arm/gcc-new-makeinfo.patch         | 35 ++++++++++++++++++++++
 meta/packages/gcc/gcc_csl-arm-2006q1.bb            |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch

(limited to 'meta/packages/gcc')

diff --git a/meta/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/meta/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
new file mode 100644
index 0000000000..b984605af7
--- /dev/null
+++ b/meta/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
@@ -0,0 +1,35 @@
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- gcc-2006q1.orig/configure
++++ gcc-2006q1/configure
+@@ -3453,11 +3453,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
+     ;;
+--- gcc-2006q1.orig/configure.in
++++ gcc-2006q1/configure.in
+@@ -2078,11 +2078,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/gcc/gcc_csl-arm-2006q1.bb b/meta/packages/gcc/gcc_csl-arm-2006q1.bb
index d7e1f6e8ee..a4d7c5ba17 100644
--- a/meta/packages/gcc/gcc_csl-arm-2006q1.bb
+++ b/meta/packages/gcc/gcc_csl-arm-2006q1.bb
@@ -13,7 +13,8 @@ inherit autotools gettext
 require gcc-package.inc
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
-           file://gcc-configure-no-fortran.patch;patch=1;pnum=1"
+           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
+           file://gcc-new-makeinfo.patch;patch=1"
 
 #the optabi patch is already applied
 
-- 
cgit v1.2.3