On 6/17/19 11:11 AM, Arnaldo Carvalho de Melo wrote:
> Em Sun, Jun 16, 2019 at 11:46:05AM +0200, Jiri Olsa escreveu:
>> On Fri, Jun 14, 2019 at 11:39:47AM -0700, Florian Fainelli wrote:
>>> Hardcoding /usr/include/slang is fundamentally incompatible with cross
>>> compilation and will lead to the inability for a cross-compiled
>>> environment to properly detect whether slang is available or not.
>>>
>>> If /usr/include/slang is necessary that is a distribution specific
>>> knowledge that could be solved with either a standard pkg-config .pc
>>> file (which slang has) or simply overriding CFLAGS accordingly, but the
>>> default perf Makefile should be clean of all of that.
>>
>> fedora 30 is ok with this, I guess acme's distro test will
>> tell us about the rest ;-)
>
> Seems to be just needless old cruft:
>
> [perfbuilder@7143ebde35eb /]$ cat /etc/redhat-release
> Fedora release 20 (Heisenbug)
> [perfbuilder@7143ebde35eb /]$
> [perfbuilder@7143ebde35eb /]$ ls -la /usr/include/slang.h
> -rw-r--r--. 1 root root 87562 Apr 11 2011 /usr/include/slang.h
> [perfbuilder@7143ebde35eb /]$ ls -la /usr/include/slang/slang.h
> lrwxrwxrwx. 1 root root 10 Jun 17 16:41 /usr/include/slang/slang.h ->
> ../slang.h
> [perfbuilder@7143ebde35eb /]$
>
> So I'm removing that comment:
>
>>> # Fedora has /usr/include/slang/slang.h, but ubuntu
>>> /usr/include/slang.h
>
> And adding a:
>
> Fixes: ef7b93a11904 ("perf report: Librarize the annotation code and use it
> in the newt browser")
OK, I was not sure if you would consider that a worthy fix or not, but
that works for me.
>
> Will do a build with all the containers and check that the output for
> all the ones with the slang devel package installed have slang
> successfully detected.
Thanks, let me know if that does not work somehow.
--
Florian
