From 9a1705ef805b0b5a8e8bf2986a521bf5f29e4556 Mon Sep 17 00:00:00 2001 From: Liang Li Date: Wed, 22 Aug 2012 16:02:33 +0800 Subject: kernel.bbclass: fix INC directory for SLANG In the kernel's tools/perf/Makefile CFLAGS was previously hard coded to contain "-I/usr/include/slang" to work with hosts that have "/usr/include/slang/slang.h" as well as hosts that have "/usr/include/slang.h". This path can cause compile warnings like: cc1: warning: '/usr/include/slang' doesn't exists. or cc1: warning: include location "/usr/include/slang" is unsafe for cross-compilation [-Wpoison-system-directories] Then in some cases warnings become errors if WERROR is enabled hence build errors. In coordination with a kernel fix, we can fix this error for all kernels by modifying the perf Makefile within the staged kernel source. (From OE-Core rev: 4e0daf05ed04e9fb4343032c6290a379f53b89f3) Signed-off-by: Liang Li Signed-off-by: Bruce Ashfield Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto/noslang.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 meta/recipes-kernel/linux/linux-yocto/noslang.patch (limited to 'meta/recipes-kernel/linux/linux-yocto') diff --git a/meta/recipes-kernel/linux/linux-yocto/noslang.patch b/meta/recipes-kernel/linux/linux-yocto/noslang.patch deleted file mode 100644 index 9cada34d11..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto/noslang.patch +++ /dev/null @@ -1,20 +0,0 @@ -We (OE) install slang into /usr/include so we never need to look into -/usr/include/slang/. We never want to look into a hardcoded path like this -since it triggers host infection issues. For now, simply remove this -since it causes us problems. - -Upstream-Status: Pending (would need rework) - -Index: tools/perf/Makefile -=================================================================== ---- linux.orig/tools/perf/Makefile 2012-08-07 10:29:43.020149620 +0000 -+++ linux/tools/perf/Makefile 2012-08-07 10:30:08.128148098 +0000 -@@ -504,7 +504,7 @@ - BASIC_CFLAGS += -DNO_NEWT_SUPPORT - else - # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h -- BASIC_CFLAGS += -I/usr/include/slang -+ # BASIC_CFLAGS += -I/usr/include/slang - EXTLIBS += -lnewt -lslang - LIB_OBJS += $(OUTPUT)util/ui/setup.o - LIB_OBJS += $(OUTPUT)util/ui/browser.o -- cgit v1.2.3-54-g00ecf