diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-07-16 16:52:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:09:01 +0100 |
commit | 478dbd3f007ec4c2dc44d19c4344c812726d8d4a (patch) | |
tree | 9f8acda3ac4f76c376281adec3f0da78848882e6 /meta/recipes-devtools/diffstat/diffstat/aclocal.patch | |
parent | 01e556cd0dad84a926c6ee15587a287abaa1e6db (diff) | |
download | poky-478dbd3f007ec4c2dc44d19c4344c812726d8d4a.tar.gz |
diffstat: update to version 1.59
Remove unneeded patches, since they're included in new version.
(From OE-Core rev: 0e2d98bc17d4f3b80926f9a86006010ea6907a74)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/diffstat/diffstat/aclocal.patch')
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat/aclocal.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch deleted file mode 100644 index cde4a4050b..0000000000 --- a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro. | ||
2 | The original macro name (AC_ACVERSION) leads to this error: | ||
3 | |||
4 | | autoreconf: running: aclocal --system-acdir=/poky/buildnew/tmp/work/i586-poky-linux/diffstat/1.57-r0/build/aclocal-copy/ --automake-acdir=/poky/buildnew/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force | ||
5 | | aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' | ||
6 | | configure.in:9: error: m4_defn: undefined macro: AC_ACVERSION | ||
7 | | acinclude.m4:989: CF_PROG_CC is expanded from... | ||
8 | | configure.in:9: the top level | ||
9 | | autom4te: m4 failed with exit status: 1 | ||
10 | |||
11 | Upstream-Status: Submitted (via email) | ||
12 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> | ||
13 | |||
14 | Index: diffstat-1.58/aclocal.m4 | ||
15 | =================================================================== | ||
16 | --- diffstat-1.58.orig/aclocal.m4 2013-10-29 01:43:23.000000000 +0200 | ||
17 | +++ diffstat-1.58/aclocal.m4 2013-11-04 11:22:53.461562567 +0200 | ||
18 | @@ -13,16 +13,16 @@ | ||
19 | dnl Conditionally generate script according to whether we're using a given autoconf. | ||
20 | dnl | ||
21 | dnl $1 = version to compare against | ||
22 | -dnl $2 = code to use if AC_ACVERSION is at least as high as $1. | ||
23 | -dnl $3 = code to use if AC_ACVERSION is older than $1. | ||
24 | +dnl $2 = code to use if AC_AUTOCONF_VERSION is at least as high as $1. | ||
25 | +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. | ||
26 | define([CF_ACVERSION_CHECK], | ||
27 | [ | ||
28 | ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl | ||
29 | ifdef([m4_version_compare], | ||
30 | -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], | ||
31 | +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], | ||
32 | [CF_ACVERSION_COMPARE( | ||
33 | AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), | ||
34 | -AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl | ||
35 | +AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_AUTOCONF_VERSION)), AC_AUTOCONF_VERSION, [$2], [$3])])])dnl | ||
36 | dnl --------------------------------------------------------------------------- | ||
37 | dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 | ||
38 | dnl -------------------- | ||