| Message ID | 20220106072627.476524-1-irogers@google.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | perf build: Lower the priority of tools/lib includes | expand |
Em Wed, Jan 05, 2022 at 11:26:27PM -0800, Ian Rogers escreveu: > 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") Hi, You forgot to add your Signed-off-by:, I'm adding it as you usually provide it, ok? - Arnaldo > --- > 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
Em Thu, Jan 06, 2022 at 04:28:58PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Wed, Jan 05, 2022 at 11:26:27PM -0800, Ian Rogers escreveu: > > 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") > > Hi, > > You forgot to add your Signed-off-by:, I'm adding it as you > usually provide it, ok? Also adding: Reported-by: Jiri Slaby <jirislaby@kernel.org> - Arnaldo
On Thu, Jan 6, 2022 at 11:31 AM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Thu, Jan 06, 2022 at 04:28:58PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Wed, Jan 05, 2022 at 11:26:27PM -0800, Ian Rogers escreveu: > > > 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") > > > > Hi, > > > > You forgot to add your Signed-off-by:, I'm adding it as you > > usually provide it, ok? > > Also adding: > > Reported-by: Jiri Slaby <jirislaby@kernel.org> > > - Arnaldo Thanks Arnaldo! Both good with me. Ian
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
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(-)