tools: Harmonize the various build messages in perf, lib-traceevent, lib-lk
The various build lines from libtraceevent and perf mix up during a
parallel build and produce unaligned output like:
CC builtin-buildid-list.o
CC builtin-buildid-cache.o
CC builtin-list.o
CC FPIC trace-seq.o
CC builtin-record.o
CC FPIC parse-filter.o
CC builtin-report.o
CC builtin-stat.o
CC FPIC parse-utils.o
CC FPIC kbuffer-parse.o
CC builtin-timechart.o
CC builtin-top.o
CC builtin-script.o
BUILD STATIC LIB libtraceevent.a
CC builtin-probe.o
CC builtin-kmem.o
CC builtin-lock.o
To solve this, harmonize all the build message alignments to be similar
to the kernel's kbuild output: prefixed by two spaces and 11-char wide.
After the patch the output looks pretty tidy, even if output lines get
mixed up:
CC builtin-annotate.o
FLAGS: * new build flags or cross compiler
CC builtin-bench.o
AR liblk.a
CC bench/sched-messaging.o
CC FPIC event-parse.o
CC bench/sched-pipe.o
CC FPIC trace-seq.o
CC bench/mem-memcpy.o
CC bench/mem-memset.o
CC FPIC parse-filter.o
CC builtin-diff.o
CC builtin-evlist.o
CC builtin-help.o
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1381312169-17354-3-git-send-email-mingo@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
8ec19c0eba
commit
65fb09922d
@ -134,14 +134,14 @@ ifeq ($(VERBOSE),1)
|
|||||||
print_install =
|
print_install =
|
||||||
else
|
else
|
||||||
Q = @
|
Q = @
|
||||||
print_compile = echo ' CC '$(OBJ);
|
print_compile = echo ' CC '$(OBJ);
|
||||||
print_app_build = echo ' BUILD '$(OBJ);
|
print_app_build = echo ' BUILD '$(OBJ);
|
||||||
print_fpic_compile = echo ' CC FPIC '$(OBJ);
|
print_fpic_compile = echo ' CC FPIC '$(OBJ);
|
||||||
print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ);
|
print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ);
|
||||||
print_plugin_obj_compile = echo ' CC PLUGIN OBJ '$(OBJ);
|
print_plugin_obj_compile = echo ' BUILD PLUGIN OBJ '$(OBJ);
|
||||||
print_plugin_build = echo ' CC PLUGI '$(OBJ);
|
print_plugin_build = echo ' BUILD PLUGIN '$(OBJ);
|
||||||
print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ);
|
print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ);
|
||||||
print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2';
|
print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2';
|
||||||
endif
|
endif
|
||||||
|
|
||||||
do_fpic_compile = \
|
do_fpic_compile = \
|
||||||
@ -268,7 +268,7 @@ TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE)
|
|||||||
TRACEEVENT-CFLAGS: force
|
TRACEEVENT-CFLAGS: force
|
||||||
@FLAGS='$(TRACK_CFLAGS)'; \
|
@FLAGS='$(TRACK_CFLAGS)'; \
|
||||||
if test x"$$FLAGS" != x"`cat TRACEEVENT-CFLAGS 2>/dev/null`" ; then \
|
if test x"$$FLAGS" != x"`cat TRACEEVENT-CFLAGS 2>/dev/null`" ; then \
|
||||||
echo 1>&2 " * new build flags or cross compiler"; \
|
echo 1>&2 " FLAGS: * new build flags or cross compiler"; \
|
||||||
echo "$$FLAGS" >TRACEEVENT-CFLAGS; \
|
echo "$$FLAGS" >TRACEEVENT-CFLAGS; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -145,16 +145,17 @@ endif
|
|||||||
|
|
||||||
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
||||||
ifneq ($(V),1)
|
ifneq ($(V),1)
|
||||||
QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
|
QUIET_ASCIIDOC = @echo ' ASCIIDOC '$@;
|
||||||
QUIET_XMLTO = @echo ' ' XMLTO $@;
|
QUIET_XMLTO = @echo ' XMLTO '$@;
|
||||||
QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
|
QUIET_DB2TEXI = @echo ' DB2TEXI '$@;
|
||||||
QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
|
QUIET_MAKEINFO = @echo ' MAKEINFO '$@;
|
||||||
QUIET_DBLATEX = @echo ' ' DBLATEX $@;
|
QUIET_DBLATEX = @echo ' DBLATEX '$@;
|
||||||
QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
|
QUIET_XSLTPROC = @echo ' XSLTPROC '$@;
|
||||||
QUIET_GEN = @echo ' ' GEN $@;
|
QUIET_GEN = @echo ' GEN '$@;
|
||||||
QUIET_STDERR = 2> /dev/null
|
QUIET_STDERR = 2> /dev/null
|
||||||
QUIET_SUBDIR0 = +@subdir=
|
QUIET_SUBDIR0 = +@subdir=
|
||||||
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
QUIET_SUBDIR1 = ;$(NO_SUBDIR) \
|
||||||
|
echo ' SUBDIR ' $$subdir; \
|
||||||
$(MAKE) $(PRINT_DIR) -C $$subdir
|
$(MAKE) $(PRINT_DIR) -C $$subdir
|
||||||
export V
|
export V
|
||||||
endif
|
endif
|
||||||
|
|||||||
@ -38,7 +38,7 @@ ifneq ($(O),)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
define print_msg
|
define print_msg
|
||||||
@printf ' BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n'
|
@printf ' BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n'
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define make
|
define make
|
||||||
|
|||||||
@ -784,7 +784,7 @@ TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\
|
|||||||
$(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS
|
$(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS
|
||||||
@FLAGS='$(TRACK_CFLAGS)'; \
|
@FLAGS='$(TRACK_CFLAGS)'; \
|
||||||
if test x"$$FLAGS" != x"`cat $(OUTPUT)PERF-CFLAGS 2>/dev/null`" ; then \
|
if test x"$$FLAGS" != x"`cat $(OUTPUT)PERF-CFLAGS 2>/dev/null`" ; then \
|
||||||
echo 1>&2 " * new build flags or prefix"; \
|
echo 1>&2 " FLAGS: * new build flags or prefix"; \
|
||||||
echo "$$FLAGS" >$(OUTPUT)PERF-CFLAGS; \
|
echo "$$FLAGS" >$(OUTPUT)PERF-CFLAGS; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -59,21 +59,22 @@ QUIET_SUBDIR0 = +$(MAKE) $(COMMAND_O) -C # space to separate -C and subdir
|
|||||||
QUIET_SUBDIR1 =
|
QUIET_SUBDIR1 =
|
||||||
|
|
||||||
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
||||||
ifneq ($(V),1)
|
ifneq ($(V),1)
|
||||||
QUIET_CC = @echo ' ' CC $@;
|
QUIET_CC = @echo ' CC '$@;
|
||||||
QUIET_AR = @echo ' ' AR $@;
|
QUIET_AR = @echo ' AR '$@;
|
||||||
QUIET_LINK = @echo ' ' LINK $@;
|
QUIET_LINK = @echo ' LINK '$@;
|
||||||
QUIET_MKDIR = @echo ' ' MKDIR $@;
|
QUIET_MKDIR = @echo ' MKDIR '$@;
|
||||||
QUIET_GEN = @echo ' ' GEN $@;
|
QUIET_GEN = @echo ' GEN '$@;
|
||||||
QUIET_SUBDIR0 = +@subdir=
|
QUIET_SUBDIR0 = +@subdir=
|
||||||
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
QUIET_SUBDIR1 = ;$(NO_SUBDIR) \
|
||||||
|
echo ' SUBDIR '$$subdir; \
|
||||||
$(MAKE) $(PRINT_DIR) -C $$subdir
|
$(MAKE) $(PRINT_DIR) -C $$subdir
|
||||||
QUIET_FLEX = @echo ' ' FLEX $@;
|
QUIET_FLEX = @echo ' FLEX '$@;
|
||||||
QUIET_BISON = @echo ' ' BISON $@;
|
QUIET_BISON = @echo ' BISON '$@;
|
||||||
|
|
||||||
descend = \
|
descend = \
|
||||||
+@echo ' ' DESCEND $(1); \
|
+@echo ' DESCEND '$(1); \
|
||||||
mkdir -p $(OUTPUT)$(1) && \
|
mkdir -p $(OUTPUT)$(1) && \
|
||||||
$(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
|
$(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user