diffutils: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
Removed AM_PROG_CC_STDC. AC_PROG_CC to replace it was already
present.

(From OE-Core rev: 5e1a567872d6967ac4d5b78e9d226161d9651ded)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 18 insertions, 2 deletions

diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..f47cc79366
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Backport
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac
+--- diffutils-3.2/configure.ac  2011-08-11 18:17:54.000000000 +0300
++++ diffutils-3.2/configure.ac  2013-02-08 08:13:28.271427213 +0200
+@@ -33,7 +33,6 @@
+
+ AC_PROG_AWK
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_MISSING_PROG([HELP2MAN], [help2man])
+ AC_PROG_RANLIB
+ gl_EARLY
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index 400c8a6b3f..ef400efd1c 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -10,9 +10,11 @@ do_configure_prepend () {
         done
 }
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-SRC_URI += "file://remove-gets.patch"
+SRC_URI += "file://remove-gets.patch \
+            file://obsolete_automake_macros.patch \
+"
 
 SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc"
 SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3"