From: Robert Richter <[email protected]>
The OUTPUT directory is wrongly determind leading to:
make[3]: *** No rule to make target `.../.build/perf/PERF-VERSION-FILE'. Stop.
Fixing this by using the generic approach in script/Makefile.include.
Signed-off-by: Robert Richter <[email protected]>
---
tools/perf/Documentation/Makefile | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index f751757..1368e88 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -1,12 +1,6 @@
+include ../../scripts/Makefile.include
include ../config/utilities.mak
-OUTPUT := ./
-ifeq ("$(origin O)", "command line")
- ifneq ($(O),)
- OUTPUT := $(O)/
- endif
-endif
-
MAN1_TXT= \
$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard perf-*.txt)) \
--
1.8.1.1
hi,
looks like this one is breaking the 'make install' for perf with:
------------------------------------------------------------------------
$ touch Documentation/perf-diff.txt
[jolsa@krava perf]$ touch Documentation/perf-diff.txt
[jolsa@krava perf]$ make install-doc
CHK -fstack-protector-all
CHK -Wstack-protector
CHK -Wvolatile-register-var
CHK -D_FORTIFY_SOURCE=2
CHK bionic
CHK libelf
CHK libdw
CHK -DLIBELF_MMAP
CHK -DLIBELF_MMAP
CHK libunwind
config/Makefile:223: No libunwind found, disabling post unwind support.
Please install libunwind-dev[el] >= 0.99
CHK libaudit
CHK libslang
CHK gtk2
CHK -DHAVE_GTK_INFO_BAR
CHK perl
CHK python
CHK python version
CHK libbfd
CHK -DHAVE_STRLCPY
CHK -DHAVE_ON_EXIT
CHK -DBACKTRACE_SUPPORT
CHK libnuma
SUBDIR Documentation
SUBDIR ../
CHK -fstack-protector-all
CHK -Wstack-protector
CHK -Wvolatile-register-var
CHK -D_FORTIFY_SOURCE=2
CHK bionic
CHK libelf
CHK libdw
CHK -DLIBELF_MMAP
CHK -DLIBELF_MMAP
CHK libunwind
config/Makefile:223: No libunwind found, disabling post unwind support.
Please install libunwind-dev[el] >= 0.99
CHK libaudit
CHK libslang
CHK gtk2
CHK -DHAVE_GTK_INFO_BAR
CHK perl
CHK python
CHK python version
CHK libbfd
CHK -DHAVE_STRLCPY
CHK -DHAVE_ON_EXIT
CHK -DBACKTRACE_SUPPORT
CHK libnuma
ASCIIDOC perf-diff.xml
XMLTO perf-diff.1
usage: xmlto [OPTION]... FORMAT XML
OPTIONs are:
-v verbose output (-vv for very verbose)
-x stylesheet use the specified stylesheet instead of choosing one
-m fragment use the XSL fragment to customize the stylesheet
-o directory put output in the specified directory instead of
the current working directory
-p postprocopts pass option to postprocessor
--extensions turn on stylesheet extensions for this tool chain
--noautosize do not autodetect paper size via locales or paperconf
--noclean temp files are not deleted automatically
(good for diagnostics)
--noextensions do not use passivetex/fop extensions
--searchpath colon-separated list of fallback directories
--skip-validation
do not attempt to validate the input before processing
--stringparam paramname=paramvalue
pass a named parameter to the stylesheet from the
command line
--with-fop use fop for formatting (if fop available)
--with-dblatex use dblatex for formatting (if dblatex available)
Available FORMATs depend on the type of the XML file (which is
determined automatically).
For documents of type "fo":
awt mif pcl svg txt
For documents of type "docbook":
awt dvi epub fo html htmlhelp html-nochunks javahelp man mif
pcl pdf ps svg txt xhtml xhtml-nochunks
make[1]: *** [perf-diff.1] Error 1
make: *** [install-doc] Error 2
------------------------------------------------------------------------
I bistected the issue to this one.. it works after I reverted it
'make -f tests/make' test catches this error ;-)
jirka
On Mon, May 06, 2013 at 08:40:14PM +0200, Robert Richter wrote:
> From: Robert Richter <[email protected]>
>
> The OUTPUT directory is wrongly determind leading to:
>
> make[3]: *** No rule to make target `.../.build/perf/PERF-VERSION-FILE'. Stop.
>
> Fixing this by using the generic approach in script/Makefile.include.
>
> Signed-off-by: Robert Richter <[email protected]>
> ---
> tools/perf/Documentation/Makefile | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
> index f751757..1368e88 100644
> --- a/tools/perf/Documentation/Makefile
> +++ b/tools/perf/Documentation/Makefile
> @@ -1,12 +1,6 @@
> +include ../../scripts/Makefile.include
> include ../config/utilities.mak
>
> -OUTPUT := ./
> -ifeq ("$(origin O)", "command line")
> - ifneq ($(O),)
> - OUTPUT := $(O)/
> - endif
> -endif
> -
> MAN1_TXT= \
> $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
> $(wildcard perf-*.txt)) \
> --
> 1.8.1.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
Em Thu, Jun 20, 2013 at 03:41:54PM +0200, Jiri Olsa escreveu:
> hi,
> looks like this one is breaking the 'make install' for perf with:
> XMLTO perf-diff.1
> usage: xmlto [OPTION]... FORMAT XML
> OPTIONs are:
> -v verbose output (-vv for very verbose)
> make: *** [install-doc] Error 2
> ------------------------------------------------------------------------
>
> I bistected the issue to this one.. it works after I reverted it
>
> 'make -f tests/make' test catches this error ;-)
Humm, I did use it, running it again to see why I didn't notice this
problem...
- Arnaldo
On Thu, Jun 20, 2013 at 11:52:22AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Thu, Jun 20, 2013 at 03:41:54PM +0200, Jiri Olsa escreveu:
> > hi,
> > looks like this one is breaking the 'make install' for perf with:
> > XMLTO perf-diff.1
> > usage: xmlto [OPTION]... FORMAT XML
> > OPTIONs are:
> > -v verbose output (-vv for very verbose)
> > make: *** [install-doc] Error 2
> > ------------------------------------------------------------------------
> >
> > I bistected the issue to this one.. it works after I reverted it
> >
> > 'make -f tests/make' test catches this error ;-)
>
> Humm, I did use it, running it again to see why I didn't notice this
> problem...
argghhh it does not.. sry ;) I just recalled our previous conversation:
<jolsa> 'make -f tests/make' should catch it ;)
<jolsa> nope, it does not
<jolsa> will fix it ... the tests/make
...
I thought I posted it.. and I did not.. I will ;-)
Anyway the install-doc is broken..
jirka
Em Thu, Jun 20, 2013 at 03:41:54PM +0200, Jiri Olsa escreveu:
> hi,
> looks like this one is breaking the 'make install' for perf with:
>
> ------------------------------------------------------------------------
> $ touch Documentation/perf-diff.txt
> [jolsa@krava perf]$ touch Documentation/perf-diff.txt
Robert, so this one is with:
cd tools/perf
make install-doc
I tested with:
make -C tools/perf O=/tmp/build/perf install-doc
and it works, so it is just the in tree build that fails.
- Arnaldo
> [jolsa@krava perf]$ make install-doc
> CHK -fstack-protector-all
> CHK -Wstack-protector
> CHK -Wvolatile-register-var
> CHK -D_FORTIFY_SOURCE=2
> CHK bionic
> CHK libelf
> CHK libdw
> CHK -DLIBELF_MMAP
> CHK -DLIBELF_MMAP
> CHK libunwind
> config/Makefile:223: No libunwind found, disabling post unwind support.
> Please install libunwind-dev[el] >= 0.99
> CHK libaudit
> CHK libslang
> CHK gtk2
> CHK -DHAVE_GTK_INFO_BAR
> CHK perl
> CHK python
> CHK python version
> CHK libbfd
> CHK -DHAVE_STRLCPY
> CHK -DHAVE_ON_EXIT
> CHK -DBACKTRACE_SUPPORT
> CHK libnuma
> SUBDIR Documentation
> SUBDIR ../
> CHK -fstack-protector-all
> CHK -Wstack-protector
> CHK -Wvolatile-register-var
> CHK -D_FORTIFY_SOURCE=2
> CHK bionic
> CHK libelf
> CHK libdw
> CHK -DLIBELF_MMAP
> CHK -DLIBELF_MMAP
> CHK libunwind
> config/Makefile:223: No libunwind found, disabling post unwind support.
> Please install libunwind-dev[el] >= 0.99
> CHK libaudit
> CHK libslang
> CHK gtk2
> CHK -DHAVE_GTK_INFO_BAR
> CHK perl
> CHK python
> CHK python version
> CHK libbfd
> CHK -DHAVE_STRLCPY
> CHK -DHAVE_ON_EXIT
> CHK -DBACKTRACE_SUPPORT
> CHK libnuma
> ASCIIDOC perf-diff.xml
> XMLTO perf-diff.1
> usage: xmlto [OPTION]... FORMAT XML
> OPTIONs are:
> -v verbose output (-vv for very verbose)
> -x stylesheet use the specified stylesheet instead of choosing one
> -m fragment use the XSL fragment to customize the stylesheet
> -o directory put output in the specified directory instead of
> the current working directory
> -p postprocopts pass option to postprocessor
> --extensions turn on stylesheet extensions for this tool chain
> --noautosize do not autodetect paper size via locales or paperconf
> --noclean temp files are not deleted automatically
> (good for diagnostics)
> --noextensions do not use passivetex/fop extensions
> --searchpath colon-separated list of fallback directories
> --skip-validation
> do not attempt to validate the input before processing
> --stringparam paramname=paramvalue
> pass a named parameter to the stylesheet from the
> command line
> --with-fop use fop for formatting (if fop available)
> --with-dblatex use dblatex for formatting (if dblatex available)
>
> Available FORMATs depend on the type of the XML file (which is
> determined automatically).
>
> For documents of type "fo":
> awt mif pcl svg txt
>
> For documents of type "docbook":
> awt dvi epub fo html htmlhelp html-nochunks javahelp man mif
> pcl pdf ps svg txt xhtml xhtml-nochunks
> make[1]: *** [perf-diff.1] Error 1
> make: *** [install-doc] Error 2
> ------------------------------------------------------------------------
>
> I bistected the issue to this one.. it works after I reverted it
>
> 'make -f tests/make' test catches this error ;-)
>
> jirka
>
> On Mon, May 06, 2013 at 08:40:14PM +0200, Robert Richter wrote:
> > From: Robert Richter <[email protected]>
> >
> > The OUTPUT directory is wrongly determind leading to:
> >
> > make[3]: *** No rule to make target `.../.build/perf/PERF-VERSION-FILE'. Stop.
> >
> > Fixing this by using the generic approach in script/Makefile.include.
> >
> > Signed-off-by: Robert Richter <[email protected]>
> > ---
> > tools/perf/Documentation/Makefile | 8 +-------
> > 1 file changed, 1 insertion(+), 7 deletions(-)
> >
> > diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
> > index f751757..1368e88 100644
> > --- a/tools/perf/Documentation/Makefile
> > +++ b/tools/perf/Documentation/Makefile
> > @@ -1,12 +1,6 @@
> > +include ../../scripts/Makefile.include
> > include ../config/utilities.mak
> >
> > -OUTPUT := ./
> > -ifeq ("$(origin O)", "command line")
> > - ifneq ($(O),)
> > - OUTPUT := $(O)/
> > - endif
> > -endif
> > -
> > MAN1_TXT= \
> > $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
> > $(wildcard perf-*.txt)) \
> > --
> > 1.8.1.1
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
Jiri and Arnaldo,
On 20.06.13 12:26:03, Arnaldo Carvalho de Melo wrote:
> Robert, so this one is with:
>
> cd tools/perf
> make install-doc
>
> I tested with:
>
> make -C tools/perf O=/tmp/build/perf install-doc
>
> and it works, so it is just the in tree build that fails.
The patch below fixes this. Thanks for reporting.
-Robert
>From 69714303856005a1dc84c0594a4c3ec1013f8a80 Mon Sep 17 00:00:00 2001
From: Robert Richter <[email protected]>
Date: Fri, 21 Jun 2013 14:26:44 +0200
Subject: [PATCH] perf tools: Fixing in-tree documentation build error
Fixing build error for:
$ cd tools/perf
$ make install-doc
The following patch changed handling of the OUTPUT variable:
79e10cb perf tools: Fix output directory of Documentation/
Now, OUTPUT is unset if the build directory is the current working dir
which is the usual case for kbuild. The xmlto rule could not handle
this. This patch fixes this.
Reported-by: Jiri Olsa <[email protected]>
Signed-off-by: Robert Richter <[email protected]>
Signed-off-by: Robert Richter <[email protected]>
---
tools/perf/Documentation/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index 1368e88..5a37a7c 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -271,7 +271,7 @@ $(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 $<
$(OUTPUT)%.xml : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
--
1.7.7.6
Em Fri, Jun 21, 2013 at 02:50:20PM +0200, Robert Richter escreveu:
> Jiri and Arnaldo,
>
> On 20.06.13 12:26:03, Arnaldo Carvalho de Melo wrote:
> > Robert, so this one is with:
> >
> > cd tools/perf
> > make install-doc
> >
> > I tested with:
> >
> > make -C tools/perf O=/tmp/build/perf install-doc
> >
> > and it works, so it is just the in tree build that fails.
>
> The patch below fixes this. Thanks for reporting.
Ok, I'll fold that with the previous one before pushing to Ingo,
Thanks!
- Arnaldo
On 21.06.13 10:34:37, Arnaldo Carvalho de Melo wrote:
> Em Fri, Jun 21, 2013 at 02:50:20PM +0200, Robert Richter escreveu:
> > Jiri and Arnaldo,
> >
> > On 20.06.13 12:26:03, Arnaldo Carvalho de Melo wrote:
> > > Robert, so this one is with:
> > >
> > > cd tools/perf
> > > make install-doc
> > >
> > > I tested with:
> > >
> > > make -C tools/perf O=/tmp/build/perf install-doc
> > >
> > > and it works, so it is just the in tree build that fails.
> >
> > The patch below fixes this. Thanks for reporting.
>
> Ok, I'll fold that with the previous one before pushing to Ingo,
Yes, fine with me.
-Robert
On 21.06.13 14:50:20, Robert Richter wrote:
> On 20.06.13 12:26:03, Arnaldo Carvalho de Melo wrote:
> > Robert, so this one is with:
> >
> > cd tools/perf
> > make install-doc
> >
> > I tested with:
> >
> > make -C tools/perf O=/tmp/build/perf install-doc
> >
> > and it works, so it is just the in tree build that fails.
>
> The patch below fixes this. Thanks for reporting.
Arnaldo, I noticed this fix is not yet merge with:
79e10cb perf tools: Fix output directory of Documentation/
-Robert
> diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
> index 1368e88..5a37a7c 100644
> --- a/tools/perf/Documentation/Makefile
> +++ b/tools/perf/Documentation/Makefile
> @@ -271,7 +271,7 @@ $(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 $<
>
> $(OUTPUT)%.xml : %.txt
> $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
Commit-ID: 761a0f395d5d8b7aafe563ecefbc8cf71a214a91
Gitweb: http://git.kernel.org/tip/761a0f395d5d8b7aafe563ecefbc8cf71a214a91
Author: Robert Richter <[email protected]>
AuthorDate: Mon, 6 May 2013 20:40:14 +0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 8 Jul 2013 17:31:49 -0300
perf tools: Fix output directory of Documentation/
The OUTPUT directory is wrongly determind leading to:
make[3]: *** No rule to make target `.../.build/perf/PERF-VERSION-FILE'. Stop.
Fixing this by using the generic approach in script/Makefile.include.
Signed-off-by: Robert Richter <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/Documentation/Makefile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index f751757..5a37a7c 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -1,12 +1,6 @@
+include ../../scripts/Makefile.include
include ../config/utilities.mak
-OUTPUT := ./
-ifeq ("$(origin O)", "command line")
- ifneq ($(O),)
- OUTPUT := $(O)/
- endif
-endif
-
MAN1_TXT= \
$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard perf-*.txt)) \
@@ -277,7 +271,7 @@ $(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 $<
$(OUTPUT)%.xml : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \