[OE-core] [PATCH] linux-yocto-3.4: Disable extra slang header search path

[Bruce Ashfield]

On Tue, Aug 7, 2012 at 7:17 AM, Richard Purdie
<richard.purdie at linuxfoundation.org> wrote:
> Add in a workaround to avoid host infection detection build failures
> from the slang include directory in perf. I'll defer to Bruce to
> fix this properly but we need a workaround now as this is breaking
> builds.

I was out of the office yesterday, so I couldn't check to see if the real fix
for this arrived .. I'll know once I dig out of my email backlog.

Even if I don't have the patch I've been waiting for, I'll pop this
into the tree
and send it out with a pull later today.

Cheers,

Bruce

>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> ---
> diff --git a/meta/recipes-kernel/linux/linux-yocto/noslang.patch b/meta/recipes-kernel/linux/linux-yocto/noslang.patch
> new file mode 100644
> index 0000000..9cada34
> --- a/dev/null
> +++ b/meta/recipes-kernel/linux/linux-yocto/noslang.patch
> @@ -0,0 +1,20 @@
> +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
> diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> index 48333b3..5ab46b7 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> @@ -20,6 +20,8 @@ SRCREV_meta ?= "7ff48aa47c50b6455d60ca93bc81260ce8fe1a1b"
>
>  SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
>
> +SRC_URI += "file://noslang.patch"
> +
>  LINUX_VERSION ?= "3.4.6"
>
>  PR = "${INC_PR}.0"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"