The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH RESEND] tools/build: drop slang include path in test-all
@ 2021-10-25 17:23 John Keeping
  2021-10-25 17:45 ` Florian Fainelli
  0 siblings, 1 reply; 3+ messages in thread
From: John Keeping @ 2021-10-25 17:23 UTC (permalink / raw)
  To: linux-perf-users
  Cc: John Keeping, Peter Zijlstra, Ingo Molnar,
	Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, Nick Terrell, Florian Fainelli,
	linux-kernel

Commit cbefd24f0aee3 ("tools build: Add test to check if slang.h is in
/usr/include/slang/") added a proper test to check whether slang.h is in
a subdirectory, and commit 1955c8cf5e26b ("perf tools: Don't hardcode
host include path for libslang") removed the include path for
test-libslang.bin but missed test-all.bin.  Apply the same change to
test-all.bin.

Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
Signed-off-by: John Keeping <john@metanate.com>
---
Resending as linux-perf-users wasn't included last time.
MAINTAINERS doesn't include any entries covering this file.

 tools/build/feature/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index d024b5204ba0..71390309f4d7 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -91,7 +91,7 @@ __BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(
 ###############################
 
 $(OUTPUT)test-all.bin:
-	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
+	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd -lcap
 
 $(OUTPUT)test-hello.bin:
 	$(BUILD)
-- 
2.33.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH RESEND] tools/build: drop slang include path in test-all
  2021-10-25 17:23 [PATCH RESEND] tools/build: drop slang include path in test-all John Keeping
@ 2021-10-25 17:45 ` Florian Fainelli
  2021-10-26 14:25   ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2021-10-25 17:45 UTC (permalink / raw)
  To: John Keeping, linux-perf-users
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Nick Terrell, linux-kernel

On 10/25/21 10:23 AM, John Keeping wrote:
> Commit cbefd24f0aee3 ("tools build: Add test to check if slang.h is in
> /usr/include/slang/") added a proper test to check whether slang.h is in
> a subdirectory, and commit 1955c8cf5e26b ("perf tools: Don't hardcode
> host include path for libslang") removed the include path for
> test-libslang.bin but missed test-all.bin.  Apply the same change to
> test-all.bin.
> 
> Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
> Signed-off-by: John Keeping <john@metanate.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH RESEND] tools/build: drop slang include path in test-all
  2021-10-25 17:45 ` Florian Fainelli
@ 2021-10-26 14:25   ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-10-26 14:25 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: John Keeping, linux-perf-users, Peter Zijlstra, Ingo Molnar,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Nick Terrell, linux-kernel

Em Mon, Oct 25, 2021 at 10:45:17AM -0700, Florian Fainelli escreveu:
> On 10/25/21 10:23 AM, John Keeping wrote:
> > Commit cbefd24f0aee3 ("tools build: Add test to check if slang.h is in
> > /usr/include/slang/") added a proper test to check whether slang.h is in
> > a subdirectory, and commit 1955c8cf5e26b ("perf tools: Don't hardcode
> > host include path for libslang") removed the include path for
> > test-libslang.bin but missed test-all.bin.  Apply the same change to
> > test-all.bin.
> > 
> > Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang")
> > Signed-off-by: John Keeping <john@metanate.com>
> 
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Thanks, applied.

- Arnaldo


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-26 14:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-25 17:23 [PATCH RESEND] tools/build: drop slang include path in test-all John Keeping
2021-10-25 17:45 ` Florian Fainelli
2021-10-26 14:25   ` Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox