lkml.org 
[lkml]   [2013]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] perf tools: Fix 'make tools/perf'
On 18.07.13 13:19:13, Arnaldo Carvalho de Melo wrote:
> Em Thu, Jul 18, 2013 at 02:19:24PM +0200, Robert Richter escreveu:
> > I noticed you applied the patch to acme/perf/core, but it should be
> > instead in urgent since mainline is broken.
>
> I did it because there are alternative ways to build the tools that
> don't require this fix, i.e. this is not _strictly_ needed to build the
> tools.
>
> What do you guys think: a case like this always needs to go to the
> current release candidate? Ingo?

Since it worked before with v3.10 this is a regression in v3.11.

> > No issues noticed, accept that doc is built when running the 'install'
> > target, not 'all'.

There is another problem building the doc with xmlto. I noticed odd
timestamps leading *.1 files to be rebuilt (note that the .xml file is
newer than *.1):

-rw-r--r-- 1 robert robert 5049 2013-07-18 14:57:27.000000000 +0200 perf-diff.1
-rw-r--r-- 1 robert robert 6771 2013-07-18 14:57:27.000207803 +0200 perf-diff.xml

The reason is that xmlto builds the files in /tmp. In my system /tmp
is ext3 while /home is ext4. Only ext4 supports nanosecond
timestamps. Thus, timestamps are not quite comparable and make is
confused a bit.

This would fix this, but I am not sure if we really want this change:

diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index 47df22d..1d6e045 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -273,7 +273,8 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt

$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.xml
$(QUIET_XMLTO)$(RM) $@ && \
- $(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+ $(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< && \
+ touch $@

$(OUTPUT)%.xml : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
If so, I will send a patch.

Thanks,

-Robert


\
 
 \ /
  Last update: 2013-07-18 19:41    [W:0.078 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site