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

git at git.openembedded.org git at git.openembedded.org
Fri Feb 1 15:56:08 UTC 2013


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

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]

(From OE-Core rev: 3f7f17894c097ebaa81055c8449c543b734df541)

Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

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

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





More information about the Openembedded-commits mailing list