From 478dbd3f007ec4c2dc44d19c4344c812726d8d4a Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Wed, 16 Jul 2014 16:52:05 +0800 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../diffstat/diffstat/aclocal.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal.patch (limited to 'meta/recipes-devtools/diffstat/diffstat/aclocal.patch') 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 @@ -Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro. -The original macro name (AC_ACVERSION) leads to this error: - -| 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 -| aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' -| configure.in:9: error: m4_defn: undefined macro: AC_ACVERSION -| acinclude.m4:989: CF_PROG_CC is expanded from... -| configure.in:9: the top level -| autom4te: m4 failed with exit status: 1 - -Upstream-Status: Submitted (via email) -Signed-off-by: Bogdan Marinescu - -Index: diffstat-1.58/aclocal.m4 -=================================================================== ---- diffstat-1.58.orig/aclocal.m4 2013-10-29 01:43:23.000000000 +0200 -+++ diffstat-1.58/aclocal.m4 2013-11-04 11:22:53.461562567 +0200 -@@ -13,16 +13,16 @@ - dnl Conditionally generate script according to whether we're using a given autoconf. - dnl - dnl $1 = version to compare against --dnl $2 = code to use if AC_ACVERSION is at least as high as $1. --dnl $3 = code to use if AC_ACVERSION is older than $1. -+dnl $2 = code to use if AC_AUTOCONF_VERSION is at least as high as $1. -+dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. - define([CF_ACVERSION_CHECK], - [ - ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl - ifdef([m4_version_compare], --[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], -+[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], - [CF_ACVERSION_COMPARE( - AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), --AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl -+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_AUTOCONF_VERSION)), AC_AUTOCONF_VERSION, [$2], [$3])])])dnl - dnl --------------------------------------------------------------------------- - dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 - dnl -------------------- -- cgit v1.2.3-54-g00ecf