summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-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 @@
+Add a description to the HAVE_POPEN_PROTOTYPE AC_DEFINE so that this define is
+included in config.h.
+
+Upstream-Status: Submitted (via email)
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 3f20573..ec5ca51 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -931,7 +931,7 @@ ac_cv_td_popen=no,
+ ac_cv_td_popen=yes))
+ AC_MSG_RESULT($ac_cv_td_popen)
+ if test $ac_cv_td_popen = yes; then
+- AC_DEFINE(HAVE_POPEN_PROTOTYPE)
++ AC_DEFINE(HAVE_POPEN_PROTOTYPE,[1],[Conflicting popen prototype])
+ fi
+ ])dnl
+ 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
SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
file://dirfix.patch \
file://aclocal.patch \
+ file://aclocal-popen.patch \
file://run-ptest \
"