[RFA] Fix a parallel build error in doc

[RFA] Fix a parallel build error in doc

[Jie Zhang]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

Hi,

I just found this when building our Blackfin port GDB with -j4 :

makeinfo --split-size=5000000  -I 
/home/jie/blackfin-sources/toolchain/trunk/binutils-2.20/gdb/doc -o 
annotate.info 
/home/jie/blackfin-sources/toolchain/trunk/binutils-2.20/gdb/doc/annotate.texinfo
echo "@set BUGURL @uref{http://www.gnu.org/software/gdb/bugs/}" >> 
./GDBvn.new
./gdb-cfg.texi:16: @include `GDBvn.texi': No such file or directory.
if [ "@uref{http://www.gnu.org/software/gdb/bugs/}" = 
"@uref{http://www.gnu.org/software/gdb/bugs/}" ]; then \
           echo "@set BUGURL_DEFAULT" >> ./GDBvn.new; \
         fi
mv GDBvn.new GDBvn.texi
makeinfo --split-size=5000000 -I 
/home/jie/blackfin-sources/toolchain/trunk/binutils-2.20/gdb/doc/../../readline/doc 
-I 
/home/jie/blackfin-sources/toolchain/trunk/binutils-2.20/gdb/doc/../mi 
-I /home/jie/blackfin-sources/toolchain/trunk/binutils-2.20/gdb/doc \
                 -o gdb.info 
/home/jie/blackfin-sources/toolchain/trunk/binutils-2.20/gdb/doc/gdb.texinfo
Making install in doc
makeinfo: Removing output file `annotate.info' due to errors; use 
--force to preserve.
make[3]: *** [annotate.info] Error 1

We should also add GDBvn.texi in ANNOTATE_DOC_BUILD_INCLUDES, shouldn't we?

Is the attached patch OK?

Thanks,
Jie

[-- Attachment #2: gdb-doc-makefile-fix-annotate-dep.diff --]
[-- Type: text/x-diff, Size: 605 bytes --]


	* Makefile.in (ANNOTATE_DOC_BUILD_INCLUDES): Add GDBvn.texi.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/doc/Makefile.in,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile.in
--- Makefile.in	1 Jan 2010 07:31:48 -0000	1.48
+++ Makefile.in	17 Jan 2010 00:59:29 -0000
@@ -147,7 +147,8 @@ STABS_DOC_FILES = \
 ANNOTATE_DOC_SOURCE_INCLUDES = \
 	$(srcdir)/fdl.texi
 ANNOTATE_DOC_BUILD_INCLUDES = \
-	gdb-cfg.texi
+	gdb-cfg.texi \
+	GDBvn.texi
 ANNOTATE_DOC_FILES = \
 	$(srcdir)/annotate.texinfo \
 	$(ANNOTATE_DOC_SOURCE_INCLUDES) \

Re: [RFA] Fix a parallel build error in doc

[Joel Brobecker]

> We should also add GDBvn.texi in ANNOTATE_DOC_BUILD_INCLUDES, shouldn't we?
> 
> Is the attached patch OK?

Actually, it is gdb-cfg.texi that includes GDBvn.texi, not annotate.texinfo.
So a better fix is to add that dependency to gdb-cfg.texi, no? It's kind
of borderline, since one can create gdb-cfg.texi without GDBvn.texi.
However, on the other hand, it makes it simpler for the other documents
that depend on gdb-cfg.texi, as they do not have to know that gdb-cfg.texi
depends on GDBvn.texi (and possibly other files too).

-- 
Joel

Re: [RFA] Fix a parallel build error in doc

[Jie Zhang]

On 01/18/2010 11:38 AM, Joel Brobecker wrote:
>> We should also add GDBvn.texi in ANNOTATE_DOC_BUILD_INCLUDES, shouldn't we?
>>
>> Is the attached patch OK?
>
> Actually, it is gdb-cfg.texi that includes GDBvn.texi, not annotate.texinfo.
> So a better fix is to add that dependency to gdb-cfg.texi, no? It's kind
> of borderline, since one can create gdb-cfg.texi without GDBvn.texi.
> However, on the other hand, it makes it simpler for the other documents
> that depend on gdb-cfg.texi, as they do not have to know that gdb-cfg.texi
> depends on GDBvn.texi (and possibly other files too).
>
I don't think so. For example, if foo.c includes foo.h, we don't write

foo.c: foo.h

we actually write

foo.o: foo.c foo.h


Jie

Re: [RFA] Fix a parallel build error in doc

[Joel Brobecker]

> I don't think so. For example, if foo.c includes foo.h, we don't write
[...]

Hmmm, true. OK.

-- 
Joel

Re: [RFA] Fix a parallel build error in doc

[Jie Zhang]

Joel,

On 01/18/2010 11:58 AM, Joel Brobecker wrote:
>> I don't think so. For example, if foo.c includes foo.h, we don't write
> [...]
>
> Hmmm, true. OK.
>
Is it an OK for my patch to commit? Just make sure.


Jie

Re: [RFA] Fix a parallel build error in doc

[Joel Brobecker]

> Is it an OK for my patch to commit? Just make sure.

Yes it is.

-- 
Joel

Re: [RFA] Fix a parallel build error in doc

[Jie Zhang]

On 01/18/2010 12:17 PM, Joel Brobecker wrote:
>> Is it an OK for my patch to commit? Just make sure.
>
> Yes it is.
>
Thanks! Committed. Do you think we need it for gdb-7.0 branch?


Jie

Re: [RFA] Fix a parallel build error in doc

[Joel Brobecker]

> Thanks! Committed. Do you think we need it for gdb-7.0 branch?

You can add it to the 7.0 branch, but it is unlikely that there will
be another release off that branch.

-- 
Joel

Re: [RFA] Fix a parallel build error in doc

[Jie Zhang]

On 01/18/2010 01:00 PM, Joel Brobecker wrote:
>> Thanks! Committed. Do you think we need it for gdb-7.0 branch?
>
> You can add it to the 7.0 branch, but it is unlikely that there will
> be another release off that branch.
>
I have added it to 7.0 branch.


Jie