diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-20 15:07:43 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-20 15:07:43 +0000 |
| commit | 4728d87b7a2982d7515709ecc2aa9ab4aeb664b5 (patch) | |
| tree | 608a9d8141ad7cfdee857bdaecece66a629a589c /meta/packages/binutils | |
| parent | 8ad0e3544d33946e6f2d6eac7e262e00a9c8329d (diff) | |
| download | poky-4728d87b7a2982d7515709ecc2aa9ab4aeb664b5.tar.gz | |
binutils: fix 'makeinfo >= 4.10 is too old' problem (from OE) - patch is applied upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3199 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/binutils')
| -rw-r--r-- | meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch | 22 | ||||
| -rw-r--r-- | meta/packages/binutils/binutils_2.18.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch b/meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch new file mode 100644 index 0000000000..dd21aed862 --- /dev/null +++ b/meta/packages/binutils/binutils-2.18/binutils-configure-texinfo-version.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | --- binutils-2.18/configure.orig 2007-10-11 21:09:27.000000000 -0700 | ||
| 2 | +++ binutils-2.18/configure 2007-10-11 21:10:20.000000000 -0700 | ||
| 3 | @@ -6128,7 +6128,7 @@ case " $build_configdirs " in | ||
| 4 | # For an installed makeinfo, we require it to be from texinfo 4.4 or | ||
| 5 | # higher, else we use the "missing" dummy. | ||
| 6 | if ${MAKEINFO} --version \ | ||
| 7 | - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then | ||
| 8 | + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | ||
| 9 | : | ||
| 10 | else | ||
| 11 | MAKEINFO="$MISSING makeinfo" | ||
| 12 | --- binutils-2.18/configure.ac.orig 2007-10-11 21:10:54.000000000 -0700 | ||
| 13 | +++ binutils-2.18/configure.ac 2007-10-11 21:11:13.000000000 -0700 | ||
| 14 | @@ -2403,7 +2403,7 @@ changequote(,) | ||
| 15 | # For an installed makeinfo, we require it to be from texinfo 4.4 or | ||
| 16 | # higher, else we use the "missing" dummy. | ||
| 17 | if ${MAKEINFO} --version \ | ||
| 18 | - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then | ||
| 19 | + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then | ||
| 20 | : | ||
| 21 | else | ||
| 22 | MAKEINFO="$MISSING makeinfo" | ||
diff --git a/meta/packages/binutils/binutils_2.18.bb b/meta/packages/binutils/binutils_2.18.bb index a9b4d995b2..78000c7af6 100644 --- a/meta/packages/binutils/binutils_2.18.bb +++ b/meta/packages/binutils/binutils_2.18.bb | |||
| @@ -3,6 +3,7 @@ require binutils.inc | |||
| 3 | SRC_URI = "\ | 3 | SRC_URI = "\ |
| 4 | ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ | 4 | ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ |
| 5 | file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ | 5 | file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ |
| 6 | file://binutils-configure-texinfo-version.patch;patch=1 \ | ||
| 6 | file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ | 7 | file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ |
| 7 | file://110-arm-eabi-conf.patch;patch=1 \ | 8 | file://110-arm-eabi-conf.patch;patch=1 \ |
| 8 | file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ | 9 | file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ |