summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-07-16 16:52:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:09:01 +0100
commit478dbd3f007ec4c2dc44d19c4344c812726d8d4a (patch)
tree9f8acda3ac4f76c376281adec3f0da78848882e6
parent01e556cd0dad84a926c6ee15587a287abaa1e6db (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch20
-rw-r--r--meta/recipes-devtools/diffstat/diffstat/aclocal.patch38
-rw-r--r--meta/recipes-devtools/diffstat/diffstat/dirfix.patch27
-rw-r--r--meta/recipes-devtools/diffstat/diffstat_1.59.bb (renamed from meta/recipes-devtools/diffstat/diffstat_1.58.bb)7
4 files changed, 2 insertions, 90 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch
deleted file mode 100644
index d95561bc48..0000000000
--- a/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Add a description to the HAVE_POPEN_PROTOTYPE AC_DEFINE so that this define is
2included in config.h.
3
4Upstream-Status: Submitted (via email)
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7
8diff --git a/aclocal.m4 b/aclocal.m4
9index 3f20573..ec5ca51 100644
10--- a/aclocal.m4
11+++ b/aclocal.m4
12@@ -931,7 +931,7 @@ ac_cv_td_popen=no,
13 ac_cv_td_popen=yes))
14 AC_MSG_RESULT($ac_cv_td_popen)
15 if test $ac_cv_td_popen = yes; then
16- AC_DEFINE(HAVE_POPEN_PROTOTYPE)
17+ AC_DEFINE(HAVE_POPEN_PROTOTYPE,[1],[Conflicting popen prototype])
18 fi
19 ])dnl
20 dnl ---------------------------------------------------------------------------
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 @@
1Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro.
2The 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
11Upstream-Status: Submitted (via email)
12Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
13
14Index: 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 --------------------
diff --git a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch
deleted file mode 100644
index 15dbf2b778..0000000000
--- a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1$libdir isn't used by the Makefile at all apart from in this mkdir.
2This will be used without any DESTDIR so if your libdir is a different
3layout to the bulid system it will cause a failure. E.g:
4
5Build system has /usr/lib only
6libdir = /usr/lib64 for the target
7Results in "mkdir: cannot create directory `/usr/lib64': Permission denied"
8
9Since the directory is never used, we can just remove the mkdir.
10
11Upstream-Status: Submitted (via email)
12
13RP 23/9/2011
14
15Index: diffstat-1.54/makefile.in
16===================================================================
17--- diffstat-1.54.orig/makefile.in 2011-09-22 19:13:11.330158571 +0100
18+++ diffstat-1.54/makefile.in 2011-09-22 19:13:35.610158363 +0100
19@@ -79,7 +79,7 @@
20 $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext)
21
22 installdirs :
23- mkdir -p $(BINDIR) $(libdir) $(man1dir)
24+ mkdir -p $(BINDIR) $(man1dir)
25
26 uninstall :
27 rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext)
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.58.bb b/meta/recipes-devtools/diffstat/diffstat_1.59.bb
index 15fb4231c8..f599622b3e 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.58.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.59.bb
@@ -8,14 +8,11 @@ LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" 8LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
9 9
10SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ 10SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
11 file://dirfix.patch \
12 file://aclocal.patch \
13 file://aclocal-popen.patch \
14 file://run-ptest \ 11 file://run-ptest \
15" 12"
16 13
17SRC_URI[md5sum] = "6d6e13f7dcfe4db5da65c5175260ea47" 14SRC_URI[md5sum] = "1dc7bc48ce846a0686a1af0d091ff8fb"
18SRC_URI[sha256sum] = "fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793" 15SRC_URI[sha256sum] = "267d1441b8889cbefbb7ca7dfd4a17f6c8bc73bc114904c74ecad945a3dbf270"
19 16
20S = "${WORKDIR}/diffstat-${PV}" 17S = "${WORKDIR}/diffstat-${PV}"
21 18