Skip to contentSkip to conversation

the patch "perf tools: Update Makefile for Android" broke 3.8-rc perf build.

DISCUSSION Thomas Backlund 2 participants 2 messages Jan 29, 2013 1 message not in the archive perf events

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Linux Kernel Mailing List skrev 12.12.2012 05:13:

Quoted 8 lines
Gitweb:     http://git.kernel.org/linus/;a=commit;h=d816ec2d1bea55cfeac373f0ab0ab8a3105e49b4
Commit:     d816ec2d1bea55cfeac373f0ab0ab8a3105e49b4
Parent:     78da39faf7c903bb6e3c20a726fde1bf98d10af8
Author:     Irina Tirdea <[email protected]>
AuthorDate: Mon Oct 8 09:43:27 2012 +0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon Oct 8 17:42:16 2012 -0300
Quoted 5 lines

perf tools: Update Makefile for Android

For cross-compiling on Android, some specific changes are needed in the Makefile.

The above patch broke perf build on i586 and x86_64:

[tmb@tmb linux-3.8-rc5]$ make -C tools/perf -s V=1 HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
CHK -fstack-protector-all
CHK -Wstack-protector
CHK -Wvolatile-register-var
CHK bionic
<stdin>:1:31: fatal error: android/api-level.h: No such file or directory compilation terminated.

This is a regression since 3.7
--
Thomas

maintainer
#2 lore raw

Hi Thomas,

Quoted 17 lines · Thomas Backlund

Linux Kernel Mailing List skrev 12.12.2012 05:13:

Quoted 8 lines
Gitweb:     http://git.kernel.org/linus/;a=commit;h=d816ec2d1bea55cfeac373f0ab0ab8a3105e49b4
Commit:     d816ec2d1bea55cfeac373f0ab0ab8a3105e49b4
Parent:     78da39faf7c903bb6e3c20a726fde1bf98d10af8
Author:     Irina Tirdea <[email protected]>
AuthorDate: Mon Oct 8 09:43:27 2012 +0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon Oct 8 17:42:16 2012 -0300
Quoted 5 lines

perf tools: Update Makefile for Android

For cross-compiling on Android, some specific changes are needed in the Makefile.

The above patch broke perf build on i586 and x86_64:

Quoted 8 lines

[tmb@tmb linux-3.8-rc5]$ make -C tools/perf -s V=1 HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
CHK -fstack-protector-all
CHK -Wstack-protector
CHK -Wvolatile-register-var
CHK bionic
<stdin>:1:31: fatal error: android/api-level.h: No such file or directory compilation terminated.

Are you sure does it break your build? In my case, it only hid the compilation from user and kept the work behind us. When I run a clean build I could see a final perf binary there.

It's because QUIET_{CC,LINK,...} honour the -s option but TRY_CC_MSG not and maybe we need something like this:

Quoted 1 line

From 5015f5f4961006e31b9298caeb86b3cc0e31bcf7 Mon Sep 17 00:00:00 2001

From: Namhyung Kim <[email protected]>
Date: Tue, 29 Jan 2013 15:48:36 +0900
Subject: [PATCH] perf tools: Hide feature test result on make -s

Other commands like QUIET_CC already honour -s option of make so the try-cc should do the same. Make it really quiet if -s option is given and ignore V=1 (it's only meaningful without -s option).

---
 tools/perf/config/utilities.mak | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/config/utilities.mak +5 -2
index e5413125e6bb..9d202fce1306 100644
@@ -181,10 +181,13 @@ _gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))
 
 # try-cc
 # Usage: option = $(call try-cc, source-to-build, cc-options, msg)
-ifndef V
 TRY_CC_OUTPUT= > /dev/null 2>&1
-endif
+ifneq ($(findstring $(MAKEFLAGS),s),s)
 TRY_CC_MSG=echo "    CHK $(3)" 1>&2;
+ifdef V
+TRY_CC_OUTPUT=
+endif
+endif
 
 try-cc = $(shell sh -c						  \
 	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \
Signature · 1 line
1.7.11.7