diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-04 11:43:18 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:18:01 +0100 |
| commit | 8939db47092b3d0d7850ed865e5990995f544f78 (patch) | |
| tree | 455d1ff4c3844c0d6e0ee569dcf7b4ac93c3eedb /meta | |
| parent | c170188511c99c248e552740d48c3f10eb745b74 (diff) | |
| download | poky-8939db47092b3d0d7850ed865e5990995f544f78.tar.gz | |
diffutils-2.8.1: fix build with automake 1.12
(From OE-Core rev: 60095f21a401aa2e9cf9841134680e1c427b4df6)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-extended/diffutils/diffutils_2.8.1.bb | 6 |
2 files changed, 31 insertions, 2 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch b/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..cc05d1dc06 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | automake 1.12 has depricated automatic de-ANSI-fication support | ||
| 4 | |||
| 5 | this patch avoids these kinds of errors: | ||
| 6 | |||
| 7 | | configure.ac:90: error: automatic de-ANSI-fication support has been removed | ||
| 8 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:12: AM_C_PROTOTYPES is expanded from... | ||
| 9 | | /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/diffutils-2.8.1-r4/diffutils-2.8.1/m4/prereq.m4:110: jm_PREREQ_QUOTEARG is expanded from... | ||
| 10 | | configure.ac:90: the top level | ||
| 11 | | autom4te: m4 failed with exit status: 1 | ||
| 12 | |||
| 13 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 14 | 2012/05/04 | ||
| 15 | |||
| 16 | Index: diffutils-2.8.1/m4/prereq.m4 | ||
| 17 | =================================================================== | ||
| 18 | --- diffutils-2.8.1.orig/m4/prereq.m4 | ||
| 19 | +++ diffutils-2.8.1/m4/prereq.m4 | ||
| 20 | @@ -115,7 +115,6 @@ AC_DEFUN([jm_PREREQ_QUOTEARG], | ||
| 21 | AC_HEADER_STDC | ||
| 22 | AC_C_BACKSLASH_A | ||
| 23 | AC_MBSTATE_T | ||
| 24 | - AM_C_PROTOTYPES | ||
| 25 | ]) | ||
| 26 | |||
| 27 | AC_DEFUN([jm_PREREQ_REGEX], | ||
diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb index 0fb3a31bc8..09eb71e665 100644 --- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb +++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb | |||
| @@ -6,9 +6,11 @@ SECTION = "base" | |||
| 6 | LICENSE = "GPLv2+" | 6 | LICENSE = "GPLv2+" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 8 | 8 | ||
| 9 | PR = "r4" | 9 | PR = "r5" |
| 10 | 10 | ||
| 11 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" | 11 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ |
| 12 | file://diffutils_fix_for_automake-1.12.patch \ | ||
| 13 | " | ||
| 12 | 14 | ||
| 13 | SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" | 15 | SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" |
| 14 | SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" | 16 | SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" |