4 files changed, 102 insertions, 0 deletions

diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
new file mode 100644
index 0000000000..ff18f1b31d
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
@@ -0,0 +1,38 @@
+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: Inappropriate [embedded specific]
+Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
+
+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 --------------------
diff --git a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch
new file mode 100644
index 0000000000..6685056333
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch
@@ -0,0 +1,27 @@
+$libdir isn't used by the Makefile at all apart from in this mkdir.
+This will be used without any DESTDIR so if your libdir is a different
+layout to the bulid system it will cause a failure. E.g:
+
+Build system has /usr/lib only
+libdir = /usr/lib64 for the target
+Results in "mkdir: cannot create directory `/usr/lib64': Permission denied"
+
+Since the directory is never used, we can just remove the mkdir.
+
+Upstream-Status: Pending
+
+RP 23/9/2011
+
+Index: diffstat-1.54/makefile.in
+===================================================================
+--- diffstat-1.54.orig/makefile.in      2011-09-22 19:13:11.330158571 +0100
++++ diffstat-1.54/makefile.in   2011-09-22 19:13:35.610158363 +0100
+@@ -79,7 +79,7 @@
+        $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext)
+ 
+ installdirs :
+-       mkdir -p $(BINDIR) $(libdir) $(man1dir)
++       mkdir -p $(BINDIR) $(man1dir)
+ 
+ uninstall :
+        rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext)
diff --git a/meta/recipes-devtools/diffstat/diffstat/run-ptest b/meta/recipes-devtools/diffstat/diffstat/run-ptest
new file mode 100644
index 0000000000..a936b3d3fe
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./testing/run_test.sh ./testing/case*.pat |sed \
+  -e 's|** ok|PASS|' \
+  -e 's|?? fail|FAIL|'
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.58.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
new file mode 100644
index 0000000000..204473a04a
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Tool to produce a statistics based on a diff"
+DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \
+the insertions, deletions, and modifications per-file. It is useful for \
+reviewing large, complex patch files."
+HOMEPAGE = "http://invisible-island.net/diffstat/"
+SECTION = "devel"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
+
+SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
+           file://dirfix.patch \
+           file://aclocal.patch \
+           file://run-ptest \
+"
+
+SRC_URI[md5sum] = "6d6e13f7dcfe4db5da65c5175260ea47"
+SRC_URI[sha256sum] = "fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793"
+
+S = "${WORKDIR}/diffstat-${PV}"
+
+inherit autotools gettext ptest
+
+do_configure () {
+        if [ ! -e ${S}/acinclude.m4 ]; then
+                mv ${S}/aclocal.m4 ${S}/acinclude.m4
+        fi
+        autotools_do_configure
+}
+
+do_install_ptest() {
+        cp -r ${S}/testing ${D}${PTEST_PATH}
+}