perf tools: Don't hardcode host include path for libslang
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 14 Jun 2019 18:39:47 +0000 (11:39 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 17 Jun 2019 18:57:20 +0000 (15:57 -0300)
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.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <quentin.monnet@netronome.com>
Cc: Stanislav Fomichev <sdf@google.com>
Fixes: ef7b93a11904 ("perf report: Librarize the annotation code and use it in the newt browser")
Link: http://lkml.kernel.org/r/20190614183949.5588-1-f.fainelli@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/build/feature/Makefile
tools/perf/Makefile.config

index 523ee42db0c8dba29bb2742a95e8f173677e5ffd..7ef7cf04a292b8dcfb64272ee088406c1f589122 100644 (file)
@@ -182,7 +182,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
index 5f16a20cae86a8863be4007f860d5260561b01cb..e04b7a81d221b6b7d201801dfc70a77dc04a74a7 100644 (file)
@@ -648,7 +648,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)