linux-kernel - [tip:perf/core] tools build: Add test to check if slang.h is in /usr/include/slang/

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-2sy7hbwkx68jr6n97qxgg0c6@git.kernel.org>
Date:   Fri, 21 Jun 2019 23:50:05 -0700
From:   tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     hpa@...or.com, linux-kernel@...r.kernel.org, tglx@...utronix.de,
        jolsa@...nel.org, adrian.hunter@...el.com, namhyung@...nel.org,
        mingo@...nel.org, f.fainelli@...il.com, acme@...hat.com
Subject: [tip:perf/core] tools build: Add test to check if slang.h is in
 /usr/include/slang/

Commit-ID:  cbefd24f0aee3a5d787a013f207f6fd31d3c76d2
Gitweb:     https://git.kernel.org/tip/cbefd24f0aee3a5d787a013f207f6fd31d3c76d2
Author:     Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Tue, 18 Jun 2019 17:43:35 -0300
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 18 Jun 2019 17:43:35 -0300

tools build: Add test to check if slang.h is in /usr/include/slang/

A few odd old distros (rhel5, 6, yeah, lots of those out in use, in many
cases we want to use upstream perf on it) have the slang header files in
/usr/include/slang/, so add a test that will be performed only when
test-all.c (the one with the most common sane settings) fails, either
because we're in one of these odd distros with slang/slang.h or because
something else failed (say libelf is not present).

So for the common case nothing changes, no additional test is performed.

Next step is to check in perf the result of these tests.

Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Florian Fainelli <f.fainelli@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
Link: https://lkml.kernel.org/n/tip-2sy7hbwkx68jr6n97qxgg0c6@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
 tools/build/Makefile.feature                                          | 2 +-
 tools/build/feature/Makefile                                          | 4 ++++
 .../build/feature/{test-libslang.c => test-libslang-include-subdir.c} | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 50377cc2f5f9..86b793dffbc4 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -53,6 +53,7 @@ FEATURE_TESTS_BASIC :=                  \
         libpython                       \
         libpython-version               \
         libslang                        \
+        libslang-include-subdir         \
         libcrypto                       \
         libunwind                       \
         pthread-attr-setaffinity-np     \
@@ -114,7 +115,6 @@ FEATURE_DISPLAY ?=              \
          numa_num_possible_cpus \
          libperl                \
          libpython              \
-         libslang               \
          libcrypto              \
          libunwind              \
          libdw-dwarf-unwind     \
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index 7ef7cf04a292..0658b8cd0e53 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -31,6 +31,7 @@ FILES=                                          \
          test-libpython.bin                     \
          test-libpython-version.bin             \
          test-libslang.bin                      \
+         test-libslang-include-subdir.bin       \
          test-libcrypto.bin                     \
          test-libunwind.bin                     \
          test-libunwind-debug-frame.bin         \
@@ -184,6 +185,9 @@ $(OUTPUT)test-libaudit.bin:
 $(OUTPUT)test-libslang.bin:
 	$(BUILD) -lslang
 
+$(OUTPUT)test-libslang-include-subdir.bin:
+	$(BUILD) -lslang
+
 $(OUTPUT)test-libcrypto.bin:
 	$(BUILD) -lcrypto
 
diff --git a/tools/build/feature/test-libslang.c b/tools/build/feature/test-libslang-include-subdir.c
similarity index 76%
copy from tools/build/feature/test-libslang.c
copy to tools/build/feature/test-libslang-include-subdir.c
index 9cbff8d1df53..3ea47ec7590e 100644
--- a/tools/build/feature/test-libslang.c
+++ b/tools/build/feature/test-libslang-include-subdir.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <slang.h>
+#include <slang/slang.h>
 
 int main(void)
 {