Patchwork [discussion] perf: specify SLANG_INC dir for perf

login
register
mail settings
Submitter Liang Li
Date Aug. 17, 2012, 3:32 a.m.
Message ID <20120817033209.GB19625@localhost>
Download mbox | patch
Permalink /patch/34773/
State New
Headers show

Comments

Liang Li - Aug. 17, 2012, 3:32 a.m.
On 2012-08-16 23:58, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2012-08-16 at 11:33 -0400, Bruce Ashfield wrote:
> > On 12-08-13 10:17 PM, Liang Li wrote:
> > > Hi Richard,
> > >
> > > Ping ...
> > >
> > > Hopefully you could recall sufficient context from this thread about
> > > the 'include path for slang.h' cause compile error issue that we are
> > > trying to fix here.
> > 
> > Bump.
> > 
> > I'm holding off on merging a kernel patch for this while this is still
> > outstanding.
> > 
> > Can I distill this into the following (in the hope of resolving it).
> > 
> >    - do we want to fix this problem for all kernels, or just the linux-yocto
> >      ones ? And by 'fix', I mean without the requirement of porting
> >      a kernel patch to older recipes.
> 
> I propose we add a sed expression to the general kernel do_install which
> changes the -I/usr/include/slang -> -I=/usr/include/slang. That should
> be generic, acceptable to upstream and fixes all kernel versions.
> 
> Comments?
> 

Good advise, so the kernel patch can be revised to:


---

With this, we might not have to touch perf.bb. So seems like we'll use
this solution? :)

Thanks,
		Liang Li

> Cheers,
> 
> Richard
Richard Purdie - Aug. 17, 2012, 9:35 a.m.
On Fri, 2012-08-17 at 11:32 +0800, Liang Li wrote:
> On 2012-08-16 23:58, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> > On Thu, 2012-08-16 at 11:33 -0400, Bruce Ashfield wrote:
> > > On 12-08-13 10:17 PM, Liang Li wrote:
> > > > Hi Richard,
> > > >
> > > > Ping ...
> > > >
> > > > Hopefully you could recall sufficient context from this thread about
> > > > the 'include path for slang.h' cause compile error issue that we are
> > > > trying to fix here.
> > > 
> > > Bump.
> > > 
> > > I'm holding off on merging a kernel patch for this while this is still
> > > outstanding.
> > > 
> > > Can I distill this into the following (in the hope of resolving it).
> > > 
> > >    - do we want to fix this problem for all kernels, or just the linux-yocto
> > >      ones ? And by 'fix', I mean without the requirement of porting
> > >      a kernel patch to older recipes.
> > 
> > I propose we add a sed expression to the general kernel do_install which
> > changes the -I/usr/include/slang -> -I=/usr/include/slang. That should
> > be generic, acceptable to upstream and fixes all kernel versions.
> > 
> > Comments?
> > 
> 
> Good advise, so the kernel patch can be revised to:
> 
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> index 067f2df..071986c 100644
> --- a/tools/perf/Makefile
> +++ b/tools/perf/Makefile
> @@ -497,7 +497,7 @@ else
>  		BASIC_CFLAGS += -DNO_NEWT_SUPPORT
>  	else
>  		# Some releases like Fedora has /usr/include/slang/slang.h other than /usr/include/slang.h
> -		SLANG_INC ?= -I/usr/include/slang
> +		SLANG_INC ?= -idirafter /usr/include/slang
>  		BASIC_CFLAGS += $(SLANG_INC)
>  
>  		EXTLIBS += -lnewt -lslang

Why do you need a kernel patch at all with the solution I mentioned
above?

> With this, we might not have to touch perf.bb. So seems like we'll use
> this solution? :)

You should need to add the sed to the general kernel do_install. We
should also get this fixed upstream in the mainline kernel. We shouldn't
need a kernel patch or any recipe change to perf.

Cheers,

Richard

Patch

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 067f2df..071986c 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -497,7 +497,7 @@  else
 		BASIC_CFLAGS += -DNO_NEWT_SUPPORT
 	else
 		# Some releases like Fedora has /usr/include/slang/slang.h other than /usr/include/slang.h
-		SLANG_INC ?= -I/usr/include/slang
+		SLANG_INC ?= -idirafter /usr/include/slang
 		BASIC_CFLAGS += $(SLANG_INC)
 
 		EXTLIBS += -lnewt -lslang