lkml.org 
[lkml]   [2019]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] perf: Don't hardcode host include path for libslang
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 ;-)

jirka

>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> tools/build/feature/Makefile | 2 +-
> tools/perf/Makefile.config | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index 4b8244ee65ce..f9432d21eff9 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -181,7 +181,7 @@ $(OUTPUT)test-libaudit.bin:
> $(BUILD) -laudit
>
> $(OUTPUT)test-libslang.bin:
> - $(BUILD) -I/usr/include/slang -lslang
> + $(BUILD) -lslang
>
> $(OUTPUT)test-libcrypto.bin:
> $(BUILD) -lcrypto
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index 85fbcd265351..b11134fdf59f 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -641,7 +641,6 @@ ifndef NO_SLANG
> NO_SLANG := 1
> else
> # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
> - CFLAGS += -I/usr/include/slang
> CFLAGS += -DHAVE_SLANG_SUPPORT
> EXTLIBS += -lslang
> $(call detected,CONFIG_SLANG)
> --
> 2.17.1
>

\
 
 \ /
  Last update: 2019-06-16 11:47    [W:0.075 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site