linux-kernel - [PATCH] perf build: Lower the priority of tools/lib includes

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>] [thread-next>] [day] [month] [year] [list]

Date:   Wed,  5 Jan 2022 23:26:27 -0800
From:   Ian Rogers <irogers@...gle.com>
To:     Jiri Slaby <jirislaby@...nel.org>,
        linux-trace-devel@...r.kernel.org,
        Steven Rostedt <rostedt@...dmis.org>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>,
        Mark Rutland <mark.rutland@....com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Jiri Olsa <jolsa@...hat.com>,
        Namhyung Kim <namhyung@...nel.org>,
        linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org,
        Tzvetomir Stoyanov <tz.stoyanov@...il.com>,
        torvalds@...ux-foundation.org, eranian@...gle.com
Cc:     Ian Rogers <irogers@...gle.com>
Subject: [PATCH] perf build: Lower the priority of tools/lib includes

tools/lib has a 1.1.0 copy of libtraceevent. If a newer system
version is installed then its headers will go in /usr/include. As -I has
priority over system headers the 1.1.0 version gets used in preference
to the system one, which isn't what is wanted. To make the behavior
match expectations use -idirafter so that any system headers have priority
over the tools/lib version.

Fixes: 08efcb4a638d ("libtraceevent: Increase libtraceevent logging when verbose")
---
 tools/perf/Makefile.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 96ad944ca6a8..0627286380fa 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -346,7 +346,7 @@ endif
 
 INC_FLAGS += -I$(src-perf)/util
 INC_FLAGS += -I$(src-perf)
-INC_FLAGS += -I$(srctree)/tools/lib/
+INC_FLAGS += -idirafter$(srctree)/tools/lib/
 
 CORE_CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-- 
2.34.1.448.ga2b2bfdf31-goog