Patchwork [1/2] diffstat: fix autoheader warning due to missing AC_DEFINE template

login
register
mail settings
Submitter Ross Burton
Date June 2, 2014, 10:03 a.m.
Message ID <1401703400-31541-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/73053/
State Accepted
Commit f9ac8c5a4cfb2f2790d5e97124207c29b013dc2e
Headers show

Comments

Ross Burton - June 2, 2014, 10:03 a.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../diffstat/diffstat/aclocal-popen.patch          |   20 ++++++++++++++++++++
 meta/recipes-devtools/diffstat/diffstat_1.58.bb    |    1 +
 2 files changed, 21 insertions(+)
 create mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch

Patch

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 0000000..d95561b
--- /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 204473a..15fb423 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 \
 "