From 0ca0dab8b1f639b1be4de81ed6e06b933275831c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 19 Mar 2013 14:13:17 -0300 Subject: [PATCH] linux-imx (2.6.35.3): Fix perf build due new Linux headers use As Yocto now use a newer Linux headers package we end having a build failure in perf as 'stddef.h' has changed and does not provide NULL definiton anymore. To workaround it we add the srcdir onto search path for include files, before sysroot one. Change-Id: I87e2ee7626f2399ab726c9d1ed0f32f18e6d2948 Signed-off-by: Otavio Salvador --- .../perf-avoid-use-sysroot-headers.patch | 33 +++++++++++++++++++ .../linux/linux-imx_2.6.35.3.bb | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-avoid-use-sysroot-headers.patch diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-avoid-use-sysroot-headers.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-avoid-use-sysroot-headers.patch new file mode 100644 index 00000000..7d129418 --- /dev/null +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-avoid-use-sysroot-headers.patch @@ -0,0 +1,33 @@ +From 9a06d08e43923f8ce35f1c649334f14d2e81941b Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Tue, 19 Mar 2013 14:04:08 -0300 +Subject: [PATCH] perf: Avoid use of sysroot's Linux headers + +As Yocto now use a newer Linux headers package we end having a build +failure in perf as 'stddef.h' has changed and does not provide NULL +definiton anymore. To workaround it we add the srcdir onto search path +for include files, before sysroot one. + +Upstream-Status: Inappropriate [build system specific change] + +Signed-off-by: Otavio Salvador +--- + tools/perf/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index 854652a..9605d46 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -301,7 +301,7 @@ endif + # Those must not be GNU-specific; they are shared with perl/ which may + # be built by a different compiler. (Note that this is an artifact now + # but it still might be nice to keep that distinction.) +-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include ++BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I../../include + BASIC_LDFLAGS = + + # Guard against environment variables +-- +1.8.1 + diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb index edfbc74a..692a290f 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb @@ -1,7 +1,7 @@ # Copyright (C) 2011-2012 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) -PR = "${INC_PR}.21" +PR = "${INC_PR}.22" include linux-imx.inc @@ -17,6 +17,7 @@ LOCALVERSION_mx5 = "-11.09.01+yocto" SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ + file://perf-avoid-use-sysroot-headers.patch \ " SRC_URI_append_mxs = " \ -- 2.40.1