[oe-commits] Tom Zanussi : oprofile: remove AX_KERNEL_VERSION from acinclude.m4

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 1831cef83931f09a1667dae58403616f36f0a723
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1831cef83931f09a1667dae58403616f36f0a723

Author: Tom Zanussi <tom.zanussi at linux.intel.com>
Date:   Sun Jan 27 08:45:14 2013 -0600

oprofile: remove AX_KERNEL_VERSION from acinclude.m4

The version of this macro in acinclude.m4 is preventing the correct
version in the package's kernelversion.m4 from being used.

Since the version in acinclude.m4 includes the obsolete config.h, any
test that uses it with newer (> 2.6.19) kernels fails.  In the case of
oprofile it means that perf_events support is never detected and thus
'legacy oprofile' is always built.

Fixing this allows the new perf_events 'operf' support to be built.

Fixes [YOCTO #3447]

Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-kernel/oprofile/oprofile.inc          |    2 +-
 meta/recipes-kernel/oprofile/oprofile/acinclude.m4 |   19 -------------------
 2 files changed, 1 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index d6d20ae..c275110 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -19,7 +19,7 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
 FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
 FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "file://opstart.patch \
            file://oprofile-no-query-modules.patch \
diff --git a/meta/recipes-kernel/oprofile/oprofile/acinclude.m4 b/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
index ffaa828..95ecd91 100644
--- a/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
+++ b/meta/recipes-kernel/oprofile/oprofile/acinclude.m4
@@ -104,25 +104,6 @@ AC_SUBST(OPROFILE_MODULE_ARCH)
 ]
 )
 
-dnl AX_KERNEL_VERSION(major, minor, level, comparison, action-if-true, action-if-false)
-AC_DEFUN([AX_KERNEL_VERSION], [
-SAVE_CFLAGS=$CFLAGS
-CFLAGS="-I$KINC -D__KERNEL__ -Werror"
-AC_TRY_COMPILE( 
-  [
-  #include <linux/version.h>
-  #include <linux/config.h>
-  ],
-  [
-  #if LINUX_VERSION_CODE $4 KERNEL_VERSION($1, $2, $3)
-  break_me_hard(\\\);
-  #endif
-  ],
-[$5],[$6],)
-CFLAGS=$SAVE_CFLAGS
-])
-
-
 dnl AX_MSG_RESULT_YN(a)
 dnl results "yes" iff a==1, "no" else
 AC_DEFUN([AX_MSG_RESULT_YN], [x=no