Libguestfs - Sep 2017 - [PATCH] builder: Fix problem about index-parse.h not being generated

Hi,

it seems that even after

commit df5bd5741b37da9cf97d7a76ac2805557aa630db
Author: Richard W.M. Jones <rjones@redhat.com>
Date:   Tue Apr 29 15:43:20 2014 +0100

    builder: Fix parallel builds of index-parse.o.

there is a small chance that a build may go wrong with the described
symtom, missing "do_parse" symbol.

It just happened to me on Debian's ppc64el buildd[1] and I could not
reproduce the issue on a ppc64el porterbox -- the whole build worked
just fine.

Cheers,
-Hilko

[1]
<https://buildd.debian.org/status/fetch.php?pkg=libguestfs&arch=ppc64el&ver=1%3A1.36.6-3&stamp=1506377176&raw=0>

* Hilko Bengen:
> commit df5bd5741b37da9cf97d7a76ac2805557aa630db
> Author: Richard W.M. Jones <rjones@redhat.com>
> Date:   Tue Apr 29 15:43:20 2014 +0100
>
>     builder: Fix parallel builds of index-parse.o.
>
> there is a small chance that a build may go wrong with the described
> symtom, missing "do_parse" symbol.
The affected tree is one that had been configured using --disable-ocaml,
therefore the special-case handling for index-parse.h did not work.

In the chapter about "Yacc and Lex support", the automake
documentation
claims that adding the generated .h file to BUILT_SOURCES is supposed to
take care of the problem.

Cheers,
-Hilko

If configured with --without-ocaml, the build might fail because the
fix added in df5bd5741b37da9cf97d7a76ac2805557aa630db was not active.
According to the automake documentation, it should be enough to set
BUILT_SOURCES.
---
 builder/Makefile.am | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/builder/Makefile.am b/builder/Makefile.am
index e3d37667b..3c7113eee 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -373,15 +373,7 @@ CLEANFILES += \
 	index-parse.h \
 	index-scan.c
 
-if HAVE_OCAML
-# Automake-generated makefile has a rule ".y.c" but lacks a rule
".y.h".
-index-parse.h: index-parse.y
-	touch $(srcdir)/index-parse.y
-	$(MAKE) index-parse.c
-# Also it doesn't generate dependencies for the C files that include
-# index-parse.h.
-index-parser-c.c index-scan.c index-validate.c: index-parse.h
-endif
+BUILT_SOURCES = index-parse.h
 
 # Apparently there's no clean way with Automake to not have them
 # in the distribution, so just remove them from the distdir.
-- 
2.14.1