systemtap: fix build with automake 1.12

(From OE-Core rev: 0ab7b586de076ae96cfa91b4f97815ea0893ef7f)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 25 insertions, 1 deletions

diff --git a/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch b/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch
new file mode 100644
index 0000000000..ef74a09587
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Pending 
+
+Automake 1.12 has deprecated automatic de-ANSI-fication support
+
+Fix this issue with automake 1.12:
+
+| configure.ac:23: error: automatic de-ANSI-fication support has been removed
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -20,7 +20,6 @@ AC_PROG_CXX
+ AC_PROG_CPP
+ AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+-AM_C_PROTOTYPES
+ AC_PROG_RANLIB
+ AC_OBJEXT
+ AC_EXEEXT
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 91bccd1fae..4d340fc8a2 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "elfutils sqlite3 systemtap-native"
 DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
 DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
 
-PR = "r3"
+PR = "r4"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 839cec35a2..9f4feee8ce 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -6,6 +6,7 @@ PV = "1.7+git${SRCPV}"
 
 SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \
+           file://systemtap_fix_for_automake_1.12.patch \
           "
 
 FILESPATH = "${FILE_DIRNAME}/systemtap"