summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-02-07 07:35:25 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-02-07 07:35:25 +0000
commite29154fcbf4978912ba63a480eebe0a31d851626 (patch)
tree18fa6d084eaf87a128a356f9ae6ab4806426d69c /meta
parent7693a4f6722c1ba65346135bf8dc41ae6bd2074b (diff)
downloadpoky-e29154fcbf4978912ba63a480eebe0a31d851626.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/binutils/binutils-2.17+csl-arm-2006q1-6/binutils-configure-texinfo-version.patch35
-rw-r--r--meta/packages/binutils/binutils_csl-arm-2006q1.bb7
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 @@
1---
2 configure | 2 +-
3 configure.in | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6--- binutils-2.17.orig/configure
7+++ binutils-2.17/configure
8@@ -3635,11 +3635,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.17.orig/configure.in
22+++ binutils-2.17/configure.in
23@@ -2204,11 +2204,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_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 = " \
43 ${bindir}/strings \ 43 ${bindir}/strings \
44 ${bindir}/strip" 44 ${bindir}/strip"
45 45
46SRC_URI = \ 46SRC_URI = "\
47 "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \ 47 http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
48 file://binutils-2.17-csl-tc-arm-mmxwc-polymorphism.patch;patch=1;pnum=1\ 48 file://binutils-2.17-csl-tc-arm-mmxwc-polymorphism.patch;patch=1;pnum=1\
49 file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1;pnum=1\ 49 file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1;pnum=1\
50 file://binutils-uclibc-100-uclibc-conf.patch;patch=1;pnum=1 \ 50 file://binutils-uclibc-100-uclibc-conf.patch;patch=1;pnum=1 \
@@ -52,7 +52,8 @@ SRC_URI = \
52 file://binutils-uclibc-300-006_better_file_error.patch;patch=1;pnum=1 \ 52 file://binutils-uclibc-300-006_better_file_error.patch;patch=1;pnum=1 \
53 file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1;pnum=1 \ 53 file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1;pnum=1 \
54 file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1;pnum=1 \ 54 file://binutils-uclibc-400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1;pnum=1 \
55 file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1;pnum=1" 55 file://binutils-uclibc-702-binutils-skip-comments.patch;patch=1;pnum=1 \
56 file://binutils-configure-texinfo-version.patch;patch=1"
56 57
57do_unpack2() { 58do_unpack2() {
58 cd ${WORKDIR} 59 cd ${WORKDIR}