summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-02-07 07:56:24 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-02-07 07:56:24 +0000
commitfa42d29201495133af60d934a3f4e2cdbe63a5e6 (patch)
tree8aa22a6e54e3c754af78a152082b740cb6eb5221 /meta
parente62eab8ae6ca8d652024c01c09a9d542342be9ca (diff)
downloadpoky-fa42d29201495133af60d934a3f4e2cdbe63a5e6.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/binutils/binutils-2.16+csl-arm-2005q3-2/binutils-configure-texinfo-version.patch35
-rw-r--r--meta/packages/binutils/binutils-cross_csl-arm-2005q3-2.bb1
-rw-r--r--meta/packages/binutils/binutils_csl-arm-2005q3-2.bb3
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 @@
1---
2 configure | 2 +-
3 configure.in | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6--- binutils-2.17pre.orig/configure
7+++ binutils-2.17pre/configure
8@@ -3541,11 +3541,11 @@ case " $build_configdirs " in
9 *)
10
11 # For an installed makeinfo, we require it to be from texinfo 4.2 or
12 # higher, else we use the "missing" dummy.
13 if ${MAKEINFO} --version \
14- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
15+ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
16 :
17 else
18 MAKEINFO="$MISSING makeinfo"
19 fi
20 ;;
21--- binutils-2.17pre.orig/configure.in
22+++ binutils-2.17pre/configure.in
23@@ -2126,11 +2126,11 @@ case " $build_configdirs " in
24 *)
25 changequote(,)
26 # For an installed makeinfo, we require it to be from texinfo 4.2 or
27 # higher, else we use the "missing" dummy.
28 if ${MAKEINFO} --version \
29- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
30+ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
31 :
32 else
33 MAKEINFO="$MISSING makeinfo"
34 fi
35 ;;
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 @@
1require binutils_csl-arm-2005q3-2.bb 1require binutils_csl-arm-2005q3-2.bb
2require binutils-cross.inc 2require binutils-cross.inc
3FILESDIR = "${FILE_DIRNAME}/binutils-{PV}"
4S = "${WORKDIR}/binutils-2.17pre" 3S = "${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 = " \
43 ${bindir}/strings \ 43 ${bindir}/strings \
44 ${bindir}/strip" 44 ${bindir}/strip"
45 45
46SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2" 46SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
47 file://binutils-configure-texinfo-version.patch;patch=1"
47 48
48do_unpack2() { 49do_unpack2() {
49 cd ${WORKDIR} 50 cd ${WORKDIR}