path: root/meta/recipes-kernel
diff options
authorBruce Ashfield <>2015-04-30 21:34:19 -0400
committerRichard Purdie <>2015-08-09 16:37:44 -0700
commit3b732f01c9c28454a29da95761a7e0a6a659547d (patch)
tree0968509b0479ff16ca19f547df6ad9dcc808c52c /meta/recipes-kernel
parentf81b891959fddb0586494d059c4c56781e0e5e4e (diff)
perf: fix build (and feature tests) for 4.1-rcX
The way that perf detects features has changed/moved via commit e6c76d620 [perf build: Move feature checks code under tools/build]. This code movement resulted in the definition of CC being dropped, and in turn the passing of --sysroot not part of the build. This results in feature tests failing with errors such as: In file included from test-pthread-attr-setaffinity-np.c:1:0: sysroots/x86_64-linux/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/4.9.2/include/stdint.h:9:26: fatal error: stdint.h: No such file or directory # include_next <stdint.h> ^ compilation terminated. While the fix is going upstream, we can modify the perf recipe to add the definition of CC into the Makefile, and we'll continue to work on patched and unpatched kernels. Upstream-status: Pending (From OE-Core rev: 46f842039422aa35f62b03f11b648c02980ea1b1) (From OE-Core rev: bff717cb51bfe4a5fb080ebfb6a5e9e0423855f3) Signed-off-by: Bruce Ashfield <> Signed-off-by: Richard Purdie <>
Diffstat (limited to 'meta/recipes-kernel')
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/ b/meta/recipes-kernel/perf/
index 420fe6b..eb27374 100644
--- a/meta/recipes-kernel/perf/
+++ b/meta/recipes-kernel/perf/
@@ -150,6 +150,9 @@ do_configure_prepend () {
if [ -e "${S}/tools/perf/config/feature-checks/Makefile" ]; then
sed -i 's,CC := $(CROSS_COMPILE)gcc -MD,CC += -MD,' ${S}/tools/perf/config/feature-checks/Makefile
+ if [ -e "${S}/tools/build/Makefile.feature" ]; then
+ sed -i 's,CFLAGS=,CC="\$(CC)" CFLAGS=,' ${S}/tools/build/Makefile.feature
+ fi
# 3.17-rc1+ has a include issue for arm/powerpc. Temporarily sed in the appropriate include
if [ -e "${S}/tools/perf/arch/$ARCH/util/skip-callchain-idx.c" ]; then
OpenPOWER on IntegriCloud