summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-06-02 11:03:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-02 21:37:53 +0100
commitf9ac8c5a4cfb2f2790d5e97124207c29b013dc2e (patch)
treeb65eec67b72c20ac58c0a54963e0697efc63bd85 /meta
parentae642d3fadb83f641034148d833a5c1deb3a1f10 (diff)
downloadpoky-f9ac8c5a4cfb2f2790d5e97124207c29b013dc2e.tar.gz
diffstat: fix autoheader warning due to missing AC_DEFINE template
(From OE-Core rev: 9c9da40b6de2cd29378e56fef643305872a52f62) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch20
-rw-r--r--meta/recipes-devtools/diffstat/diffstat_1.58.bb1
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch
new file mode 100644
index 0000000000..d95561bc48
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch
@@ -0,0 +1,20 @@
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_1.58.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
index 204473a04a..15fb4231c8 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.58.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0
10SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ 10SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
11 file://dirfix.patch \ 11 file://dirfix.patch \
12 file://aclocal.patch \ 12 file://aclocal.patch \
13 file://aclocal-popen.patch \
13 file://run-ptest \ 14 file://run-ptest \
14" 15"
15 16