similar to: [PATCH] Fix out-of-tree build: Don't create empty .y file in builddir

--- builder/Makefile.am | 18 +++++++++++++- configure.ac | 2 ++ mllib/Makefile.am | 60 +++++++++++++++++++++++++++++++--------------- ocaml/Makefile.am | 28 +++++++++++++++------- ocaml/examples/Makefile.am | 13 ++++++++++ resize/Makefile.am | 18 +++++++++++++- sparsify/Makefile.am | 18 +++++++++++++- sysprep/Makefile.am | 18

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

This is a first attempt to build libguestfs with just a ocaml bytecode compiler. The three tools written in ocaml will be build only when an ocamlopt compiler is available. Olaf --- Makefile.am | 5 ++++- configure.ac | 2 ++ ocaml/Makefile.am | 20 +++++++++++++++++--- resize/Makefile.am | 2 +- sparsify/Makefile.am | 2 +- sysprep/Makefile.am | 2 +- 6

From: Hilko Bengen <bengen at hilluzination.de> --- erlang/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/erlang/Makefile.am b/erlang/Makefile.am index f336375..2c9e359 100644 --- a/erlang/Makefile.am +++ b/erlang/Makefile.am @@ -32,7 +32,7 @@ erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin erlang_bin_DATA = guestfs.beam

--- configure.ac | 2 +- golang/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4e2bc65..9abec95 100644 --- a/configure.ac +++ b/configure.ac @@ -1530,7 +1530,7 @@ AS_IF([test "x$enable_golang" != "xno"],[ AC_CHECK_PROG([GOLANG],[go],[go],[no]) AS_IF([test "x$GOLANG" !=

Use CLEANFILES to remove the generated symlinks, and just ignore the errors when copying the scripts in srcdir!=builddir situations. Followup of commit 40ac54829d4e71b1bac76343872a2674a40c7ac0. --- bash/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bash/Makefile.am b/bash/Makefile.am index 780da64..ee9c10c 100644 --- a/bash/Makefile.am +++

--- bash/Makefile.am | 54 +++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/bash/Makefile.am b/bash/Makefile.am index 10f0861..780da64 100644 --- a/bash/Makefile.am +++ b/bash/Makefile.am @@ -21,6 +21,10 @@ scripts = \ guestfish \ guestmount \ virt-alignment-scan \ + virt-rescue \ + virt-resize + +symlinks = \

This avoids build failures in separate builds such as this one: ,---- | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma | ar cr libmlstdutils.a libmlstdutils_a-dummy.o | ranlib libmlstdutils.a | File "_none_", line 1: | Error: Files std_utils.cmo and guestfs_config.cmo | make inconsistent assumptions over

Use the $(srcdir) variable where needed, to make sure it builds also with srcdir != builddir. Furthermore, make sure that the OCaml dependencies calculation depend on the generated output_rhv_upload_*_source.ml files, otherwise there will be incomplete OCaml rules for them in the generated .depend. Fixes commit cc04573927cca97de60d544d37467e67c25867a7. --- v2v/Makefile.am | 14 +++++++------- 1

* Pino Toscano: > I do not think this is the correct approach. See my analysis here: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946594#46 This issue is for a different problem that appeared on some architectures after I forced *config.ml to be regenerated for the Debian builds of libguestfs 1.40.2, see

--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 188bed76f..1ab54500d 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ dnl Find the release date for this version. This is used in dnl the website 'index.html' file. We have to do this after dnl testing for awk in guestfs_progs.m4 above.

--- ruby/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/Makefile.am b/ruby/Makefile.am index b6654d3..e78ab59 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -51,7 +51,7 @@ RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchd install: $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB) $(MKDIR_P)

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

From: Hilko Bengen <bengen at hilluzination.de> On installations where no native OCaml compiler is available, the test program can't be compiled and so we get this message: ,---- | checking for function caml_raise_with_args... not found `---- This breaks building of the OCaml bindings. ,---- | gcc -std=gnu99 -I.. -I/usr/lib/ocaml -I../ocaml -I../lib -g -O2 -fPIC -Wall -c hivex_c.c

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

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

From: Hilko Bengen <bengen at debian.org> On installations where no native OCaml compiler is available, the test program can't be compiled and so we get this message: ,---- | checking for function caml_raise_with_args... not found `---- This breaks building of the OCaml bindings. ,---- | gcc -std=gnu99 -I.. -I/usr/lib/ocaml -I../ocaml -I../lib -g -O2 -fPIC -Wall -c hivex_c.c |

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends Gbp-Pq: Name 0012-Fix-out-of-tree-builds-of-OCaml-components.patch --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +-

Because this 'feature' is broken (since 2013): https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 we have to replace all instances of $(top_srcdir) in *_SOURCES lines with a relative path. According to what I read, this shouldn't break split builds, but I didn't test it. The only things automake moans about now are: * Unescaped left brace in regex is deprecated, passed